diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index bd2e15de4..ba1c40cf1 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -325,6 +325,11 @@ const AllView = new Lang.Class({
 
         this._availWidth = 0;
         this._availHeight = 0;
+
+        Main.overview.connect('hidden', Lang.bind(this,
+            function() {
+                this.goToPage(0);
+            }));
     },
 
     getCurrentPageY: function() {