diff --git a/js/ui/overview.js b/js/ui/overview.js
index 192cddffa..98b1fa8f7 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -78,6 +78,14 @@ class OverviewActor extends St.BoxLayout {
         this.add_child(this._controls);
     }
 
+    prepareToEnterOverview() {
+        this._controls.prepareToEnterOverview();
+    }
+
+    prepareToLeaveOverview() {
+        this._controls.prepareToLeaveOverview();
+    }
+
     animateToOverview(state, callback) {
         this._controls.animateToOverview(state, callback);
     }
@@ -511,6 +519,7 @@ var Overview = class extends Signals.EventEmitter {
 
         Meta.disable_unredirect_for_display(global.display);
 
+        this._overview.prepareToEnterOverview();
         this._overview.animateToOverview(state, () => this._showDone());
 
         Main.layoutManager.overviewGroup.set_child_above_sibling(
@@ -564,6 +573,7 @@ var Overview = class extends Signals.EventEmitter {
         this._animationInProgress = true;
         this._visibleTarget = false;
 
+        this._overview.prepareToLeaveOverview();
         this._overview.animateFromOverview(() => this._hideDone());
 
         Main.layoutManager.overviewGroup.set_child_above_sibling(
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 870cf11be..29aac35ed 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -727,8 +727,6 @@ class ControlsManager extends St.Widget {
     animateToOverview(state, callback) {
         this._ignoreShowAppsButtonToggle = true;
 
-        this.prepareToEnterOverview();
-
         this._stateAdjustment.value = ControlsState.HIDDEN;
         this._stateAdjustment.ease(state, {
             duration: Overview.ANIMATION_TIME,
@@ -748,8 +746,6 @@ class ControlsManager extends St.Widget {
     animateFromOverview(callback) {
         this._ignoreShowAppsButtonToggle = true;
 
-        this.prepareToLeaveOverview();
-
         this._stateAdjustment.ease(ControlsState.HIDDEN, {
             duration: Overview.ANIMATION_TIME,
             mode: Clutter.AnimationMode.EASE_OUT_QUAD,