diff --git a/src/main.rs b/src/main.rs
index e1495c0..a236d31 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2582,7 +2582,8 @@ impl Application for App {
             }
             Message::PaneClicked(pane) => {
                 self.pane_model.set_focus(pane);
-                return self.update_title(Some(pane));
+                let title_task = self.update_title(Some(pane));
+                return Task::batch([self.update_focus(), title_task]);
             }
             Message::PaneSplit(axis) => {
                 let result = self.pane_model.panes.split(
diff --git a/src/terminal_box.rs b/src/terminal_box.rs
index 6f568b8..e63fa2d 100644
--- a/src/terminal_box.rs
+++ b/src/terminal_box.rs
@@ -1377,8 +1377,6 @@ where
                         }
                         shell.capture_event();
                     }
-                } else {
-                    state.is_focused = false;
                 }
             }
             Event::Mouse(MouseEvent::ButtonReleased(Button::Left)) => {