diff --git a/js/ui/overview.js b/js/ui/overview.js
index 12b966927..87bf835b0 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -609,12 +609,14 @@ var Overview = class {
         this._visible = false;
         this._animationInProgress = false;
 
-        this.emit('hidden');
         // Handle any calls to show* while we were hiding
-        if (this._shown)
+        if (this._shown) {
+            this.emit('hidden');
             this._animateVisible(OverviewControls.ControlsState.WINDOW_PICKER);
-        else
+        } else {
             Main.layoutManager.hideOverview();
+            this.emit('hidden');
+        }
 
         Main.panel.style = null;