diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 53434824..65796ba6 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -423,12 +423,17 @@ const WindowList = new Lang.Class({
 
         this._overviewHidingId =
             Main.overview.connect('hiding', Lang.bind(this, function() {
-                this.actor.show();
+                this.actor.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
                 this._updateKeyboardAnchor();
                 this._updateMessageTrayAnchor();
             }));
         this._updateMessageTrayAnchor();
 
+        this._fullscreenChangedId =
+            global.screen.connect('in-fullscreen-changed', Lang.bind(this, function() {
+                this._updateMessageTrayAnchor();
+            }));
+
         this._settings = Convenience.getSettings();
         this._groupingModeChangedId =
             this._settings.connect('changed::grouping-mode',
@@ -584,6 +589,8 @@ const WindowList = new Lang.Class({
         Main.overview.disconnect(this._overviewShowingId);
         Main.overview.disconnect(this._overviewHidingId);
 
+        global.screen.disconnect(this._fullscreenChangedId);
+
         this._settings.disconnect(this._groupingModeChangedId);
 
         let windows = Meta.get_window_actors(global.screen);