diff --git a/js/ui/overview.js b/js/ui/overview.js
index 34ebec541..40cd85272 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -690,6 +690,7 @@ Overview.prototype = {
             this._animateNotVisible();
 
         this._syncInputMode();
+        global.sync_pointer();
     },
 
     _hideDone: function() {
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 974893a27..be973b60e 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -394,12 +394,6 @@ WindowOverlay.prototype = {
 
     show: function() {
         this._hidden = false;
-        let [x, y, mask] = global.get_pointer();
-        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE,
-                                                  x, y);
-        if (actor == this._windowClone.actor) {
-            this.closeButton.show();
-        }
         this.title.show();
     },