diff --git a/overview.js b/overview.js
index ead284a..5255acc 100644
--- a/overview.js
+++ b/overview.js
@@ -344,6 +344,11 @@ var dtpOverview = Utils.defineClass({
     },
 
     _showOverlay: function(overlayFromShortcut) {
+        //wait for intellihide timeout initialization
+        if (!this._panel.intellihide) {
+            return;
+        }
+
         // Restart the counting if the shortcut is pressed again
         if (this._numberOverlayTimeoutId) {
             Mainloop.source_remove(this._numberOverlayTimeoutId);
diff --git a/windowPreview.js b/windowPreview.js
index a8235c2..1991845 100644
--- a/windowPreview.js
+++ b/windowPreview.js
@@ -792,9 +792,9 @@ var thumbnailPreview = Utils.defineClass({
             }
         }
 
-        Main.activateWindow(this.window);
-
         topMenu.close(~0);
+
+        Main.activateWindow(this.window);
     },
 
     _onMotionEvent: function() {