diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index a37764913..a64cf7dec 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -662,6 +662,7 @@ var WindowOverlay = new Lang.Class({
         if (this._hidden)
             return;
 
+        this._windowClone.actor.grab_key_focus();
         this._animateVisible();
         this.emit('show-close-button');
     },