diff --git a/tui/src/running_command.rs b/tui/src/running_command.rs
index d45c37c5..02900aae 100644
--- a/tui/src/running_command.rs
+++ b/tui/src/running_command.rs
@@ -113,7 +113,7 @@ impl FloatContent for RunningCommand {
             }
             _ => {}
         }
-        true
+        false
     }
     /// Handle key events of the running command "window". Returns true when the "window" should be
     /// closed
diff --git a/tui/src/state.rs b/tui/src/state.rs
index 7b02d405..2e56e13a 100644
--- a/tui/src/state.rs
+++ b/tui/src/state.rs
@@ -509,11 +509,9 @@ impl AppState {
                             self.focus = Focus::List;
                             if !self.multi_select {
                                 self.selected_commands.clear()
-                            } else {
-                                if let Some(node) = self.get_selected_node() {
-                                    if !node.multi_select {
-                                        self.selected_commands.retain(|cmd| cmd.name != node.name);
-                                    }
+                            } else if let Some(node) = self.get_selected_node() {
+                                if !node.multi_select {
+                                    self.selected_commands.retain(|cmd| cmd.name != node.name);
                                 }
                             }
                         }