diff --git a/navigator.js b/navigator.js
index f4faf69..40845f2 100644
--- a/navigator.js
+++ b/navigator.js
@@ -126,8 +126,6 @@ var PreviewedWindowNavigator = new Lang.Class({
 var navigator;
 var Navigator = class Navigator {
     constructor() {
-        TopBar.show();
-
         navigating = true;
         this._block = Main.wm._blockAnimations;
         Main.wm._blockAnimations = true;
@@ -141,6 +139,14 @@ var Navigator = class Navigator {
         this.monitor.clickOverlay.hide();
         this.minimaps = new Map();
 
+        TopBar.show();
+        let selected = this.space.selectedWindow;
+        if (selected &&
+            (selected.fullscreen ||
+             selected.get_maximized() === Meta.MaximizeFlags.BOTH)) {
+            Tiling.animateDown(selected);
+        }
+
         this.space.startAnimate();
     }
 
diff --git a/tiling.js b/tiling.js
index 69abda6..50d8bf0 100644
--- a/tiling.js
+++ b/tiling.js
@@ -1610,7 +1610,6 @@ function animateDown(metaWindow) {
     });
 }
 
-
 /**
    Make sure that `meta_window` is in view, scrolling the space if needed.
  */