diff --git a/src/ui/widget.rs b/src/ui/widget.rs
index c3a45da1..6b4a39e6 100644
--- a/src/ui/widget.rs
+++ b/src/ui/widget.rs
@@ -153,11 +153,14 @@ impl<S, A> View<S, A> for Shortcuts<S, A> {
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<ShortcutsProps>() {
-                self.props.shortcuts = props.shortcuts.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<ShortcutsProps>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone())
     }
 }
 
@@ -407,11 +410,14 @@ where
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<TableProps<'_, R>>() {
-                self.props = props.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<TableProps<'_, R>>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone());
 
         // TODO: Move to state reducer
         if let Some(selected) = self.state.selected() {
diff --git a/src/ui/widget/container.rs b/src/ui/widget/container.rs
index 01374ea5..82a151ee 100644
--- a/src/ui/widget/container.rs
+++ b/src/ui/widget/container.rs
@@ -102,11 +102,14 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<HeaderProps>() {
-                self.props = props.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<HeaderProps>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone());
     }
 
     fn handle_key_event(&mut self, _key: Key) {
@@ -267,11 +270,14 @@ impl<'a: 'static, S, A> View<S, A> for Footer<'a, S, A> {
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<FooterProps>() {
-                self.props = props.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<FooterProps>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone());
     }
 
     fn handle_key_event(&mut self, _key: Key) {
diff --git a/src/ui/widget/input.rs b/src/ui/widget/input.rs
index 95a5bf76..a3ec3cc7 100644
--- a/src/ui/widget/input.rs
+++ b/src/ui/widget/input.rs
@@ -151,11 +151,14 @@ impl<S, A> View<S, A> for TextField<S, A> {
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<TextFieldProps>() {
-                self.props = props.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<TextFieldProps>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone());
     }
 
     fn handle_key_event(&mut self, key: Key) {
diff --git a/src/ui/widget/text.rs b/src/ui/widget/text.rs
index fe101164..70b1c001 100644
--- a/src/ui/widget/text.rs
+++ b/src/ui/widget/text.rs
@@ -168,11 +168,14 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
     }
 
     fn update(&mut self, state: &S) {
-        if let Some(on_update) = self.on_update {
-            if let Some(props) = (on_update)(state).downcast_ref::<ParagraphProps>() {
-                self.props = props.clone();
-            }
-        }
+        self.props = self
+            .on_update
+            .and_then(|on_update| {
+                (on_update)(state)
+                    .downcast_ref::<ParagraphProps>()
+                    .map(|props| props.clone())
+            })
+            .unwrap_or(self.props.clone());
     }
 
     fn handle_key_event(&mut self, key: Key) {