diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
index 6956ce2d..68b27e94 100644
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -403,8 +403,10 @@ AltTabPopup2.prototype = {
             }
 	}
 
-        if (!windows.length)
+        if (!windows.length) {
+            this.destroy();
             return false;
+        }
 
         if (!Main.pushModal(this.actor)) {
             // Probably someone else has a pointer grab, try again with keyboard only