diff --git a/internal/ui/dialog/commands.go b/internal/ui/dialog/commands.go
index f87547641b6b5585abcb8d5ffe77a84d8c632041..b560fb8478f267b9ec3aa26938787aa2954a2e39 100644
--- a/internal/ui/dialog/commands.go
+++ b/internal/ui/dialog/commands.go
@@ -176,7 +176,9 @@ func (c *Commands) Update(msg tea.Msg) tea.Msg {
 			c.list.SetFilter(value)
 			c.list.ScrollToTop()
 			c.list.SetSelected(0)
-			return cmd
+			if cmd != nil {
+				return cmd()
+			}
 		}
 	}
 	return nil
diff --git a/internal/ui/dialog/models.go b/internal/ui/dialog/models.go
index 7e568fb97e381ac984b0e7bf75c7282cc60e33f5..1830a0880975b136446ac5bb45dae0d558fc2795 100644
--- a/internal/ui/dialog/models.go
+++ b/internal/ui/dialog/models.go
@@ -222,7 +222,9 @@ func (m *Models) Update(msg tea.Msg) tea.Msg {
 			value := m.input.Value()
 			m.list.SetFilter(value)
 			m.list.ScrollToSelected()
-			return cmd
+			if cmd != nil {
+				return cmd()
+			}
 		}
 	}
 	return nil
diff --git a/internal/ui/dialog/sessions.go b/internal/ui/dialog/sessions.go
index daeec6e208dee88883b7d86282769093fef67858..13306cc87945d1dafe2240c08d04a2200d7c83b9 100644
--- a/internal/ui/dialog/sessions.go
+++ b/internal/ui/dialog/sessions.go
@@ -140,7 +140,9 @@ func (s *Session) Update(msg tea.Msg) tea.Msg {
 			s.list.SetFilter(value)
 			s.list.ScrollToTop()
 			s.list.SetSelected(0)
-			return cmd
+			if cmd != nil {
+				return cmd()
+			}
 		}
 	}
 	return nil