diff --git a/grab.js b/grab.js
index ff7fa3f..3918d8f 100644
--- a/grab.js
+++ b/grab.js
@@ -93,6 +93,7 @@ var MoveGrab = class MoveGrab {
         space.startAnimate();
         // Make sure the window actor is visible
         Tiling.animateWindow(metaWindow);
+        Navigator.getNavigator();
         Tweener.removeTweens(space.cloneContainer);
     }
 
diff --git a/navigator.js b/navigator.js
index 313ef72..2f9466f 100644
--- a/navigator.js
+++ b/navigator.js
@@ -211,6 +211,7 @@ var Navigator = class Navigator {
 
         TopBar.fixTopBar();
 
+        Scratch.animateWindows();
         this.space.startAnimate();
     }
 
@@ -320,6 +321,9 @@ var Navigator = class Navigator {
             }
         }
 
+        if (!Tiling.inGrab)
+            Scratch.showWindows();
+
         TopBar.fixTopBar();
 
         Main.wm._blockAnimations = this._block;