diff --git a/ui/gtk.c b/ui/gtk.c
index 9f9b2416c8..4f706c6bbb 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1483,6 +1483,11 @@ static gboolean gd_tab_window_close(GtkWidget *widget, GdkEvent *event,
         vc->gfx.ectx = NULL;
     }
 #endif
+
+    if (vc == gd_vc_find_by_menu(s)) {
+        gtk_widget_grab_focus(vc->focus);
+    }
+
     return TRUE;
 }