diff --git a/kitty/tabs.py b/kitty/tabs.py
index 08bad0a15..8404e5286 100644
--- a/kitty/tabs.py
+++ b/kitty/tabs.py
@@ -815,7 +815,15 @@ class Tab:  # {{{
             overlay_for = window.id
 
     def set_active_window(self, x: Window | int, for_keep_focus: Window | None = None) -> None:
+        if isinstance(x, int):
+            for q in self:
+                if q.id == x:
+                    x = q
+                    break
+            else:
+                return
         self.windows.set_active_window_group_for(x, for_keep_focus=for_keep_focus)
+        self.windows.move_window_to_top_of_group(x)
 
     def get_nth_window(self, n: int) -> Window | None:
         if self.windows: