diff --git a/kitty/boss.py b/kitty/boss.py
index 2f82b2c79..6af8838a9 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -73,14 +73,6 @@ class Boss:
         initialize_renderer()
         self.tab_manager = TabManager(opts, args)
         self.tab_manager.init(startup_session)
-        self.activate_tab_at = self.tab_manager.activate_tab_at
-
-    def __iter__(self):
-        return iter(self.tab_manager)
-
-    def iterwindows(self):
-        for t in self:
-            yield from t
 
     def add_child(self, window):
         self.child_monitor.add_child(window.id, window.child.pid, window.child.child_fd, window.screen)
@@ -110,6 +102,10 @@ class Boss:
             self.child_monitor.start()
             self.io_thread_started = True
 
+    def activate_tab_at(self, os_window_id, x):
+        # WIN: Implement this
+        pass
+
     def on_window_resize(self, window, w, h):
         # WIN: Port this
         self.tab_manager.resize()
diff --git a/kitty/mouse.c b/kitty/mouse.c
index 4d7d19f72..277ba012a 100644
--- a/kitty/mouse.c
+++ b/kitty/mouse.c
@@ -305,7 +305,7 @@ HANDLER(handle_event) {
 static inline void 
 handle_tab_bar_mouse(int button, int UNUSED modifiers) {
     if (button != GLFW_MOUSE_BUTTON_LEFT || !global_state.callback_os_window->mouse_button_pressed[button]) return;
-    call_boss(activate_tab_at, "d", global_state.callback_os_window->mouse_x);
+    call_boss(activate_tab_at, "Kd", global_state.callback_os_window->id, global_state.callback_os_window->mouse_x);
 }
 
 static inline Window*