diff --git a/kitty/tabs.py b/kitty/tabs.py
index 93f659d5c..1d0c2a15b 100644
--- a/kitty/tabs.py
+++ b/kitty/tabs.py
@@ -1018,9 +1018,8 @@ class TabManager:  # {{{
 
     def remove(self, tab: Tab) -> None:
         active_tab_before_removal = self.active_tab
+        active_tab_needs_to_change = active_tab_before_removal is tab
         self._remove_tab(tab)
-        active_tab = self.active_tab
-        active_tab_needs_to_change = (active_tab is None and (active_tab_before_removal is None or active_tab_before_removal is tab)) or active_tab is tab
         while True:
             try:
                 self.active_tab_history.remove(tab.id)