diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 5bd14e499..447e4796e 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -497,6 +497,8 @@ WindowManager.prototype = {
 
         for (let i = 0; i < switchData.windows.length; i++) {
                 let w = switchData.windows[i];
+                if (w.window.is_destroyed()) // Window gone
+                    continue;
                 if (w.window.get_parent() == switchData.outGroup) {
                     w.window.reparent(w.parent);
                     w.window.hide();