diff --git a/kitty/glfw.c b/kitty/glfw.c
index afbdb4851..bfe10ae01 100644
--- a/kitty/glfw.c
+++ b/kitty/glfw.c
@@ -261,7 +261,6 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
     }
 
     OSWindow *w = add_os_window();
-    w->id = ++global_state.os_window_id_counter;
     w->handle = glfw_window;
     update_os_window_references();
     if (logo.pixels && logo.width && logo.height) glfwSetWindowIcon(glfw_window, 1, &logo);
@@ -288,7 +287,10 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
 
 void
 destroy_os_window(OSWindow *w) {
-    if (w->handle) glfwDestroyWindow(w->handle); 
+    if (w->handle) {
+        glfwDestroyWindow(w->handle); 
+        if (current_os_window_ctx == w->handle) current_os_window_ctx = NULL;
+    }
     w->handle = NULL;
 }
 
diff --git a/kitty/state.c b/kitty/state.c
index 9837fb623..f7f30b315 100644
--- a/kitty/state.c
+++ b/kitty/state.c
@@ -78,6 +78,7 @@ add_os_window() {
     ensure_space_for(&global_state, os_windows, OSWindow, global_state.num_os_windows + 1, capacity, 1, true);
     OSWindow *ans = global_state.os_windows + global_state.num_os_windows++;
     memset(ans, 0, sizeof(OSWindow));
+    ans->id = ++global_state.os_window_id_counter;
     ans->tab_bar_render_data.vao_idx = create_cell_vao();
     END_WITH_OS_WINDOW_REFS
     return ans;
@@ -140,6 +141,7 @@ remove_window_inner(Tab *tab, id_type id) {
 static inline void
 remove_window(id_type os_window_id, id_type tab_id, id_type id) {
     WITH_TAB(os_window_id, tab_id);
+        make_os_window_context_current(osw);
         remove_window_inner(tab, id);
     END_WITH_TAB;
 }
@@ -154,6 +156,7 @@ destroy_tab(Tab *tab) {
 
 static inline void
 remove_tab_inner(OSWindow *os_window, id_type id) {
+    make_os_window_context_current(os_window);
     REMOVER(os_window->tabs, id, os_window->num_tabs, Tab, destroy_tab, os_window->capacity);
 }
 
@@ -181,6 +184,7 @@ remove_os_window(id_type os_window_id) {
     WITH_OS_WINDOW(os_window_id)
         remove_os_window_reference(os_window);
         found = true;
+        make_os_window_context_current(os_window);
     END_WITH_OS_WINDOW
     if (found) { 
         WITH_OS_WINDOW_REFS