diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index cc22e9fe..715ae249 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -765,7 +765,9 @@ class WindowList extends St.Widget {
         this._updateWorkspaceIndicatorVisibility();
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
-        this._menuManager.addMenu(this._workspaceIndicator.menu);
+        this._workspaceIndicator.connectObject('menu-set',
+            () => this._onWorkspaceMenuSet(), this);
+        this._onWorkspaceMenuSet();
 
         Main.layoutManager.addChrome(this, {
             affectsStruts: true,
@@ -862,6 +864,11 @@ class WindowList extends St.Widget {
         children[newActive].activate();
     }
 
+    _onWorkspaceMenuSet() {
+        if (this._workspaceIndicator.menu)
+            this._menuManager.addMenu(this._workspaceIndicator.menu);
+    }
+
     _updatePosition() {
         this.set_position(
             this._monitor.x,