diff --git a/tiling.js b/tiling.js
index 236e95f..61ced2f 100644
--- a/tiling.js
+++ b/tiling.js
@@ -1324,7 +1324,6 @@ class Spaces extends Map {
 
         let cloneParent = space.clip.get_parent();
         mru.forEach((space, i) => {
-            TopBar.updateIndicatorPosition(space.workspace);
             space.clip.set_position(monitor.x, monitor.y);
             space.startAnimate();
 
diff --git a/topbar.js b/topbar.js
index 4f6eb5f..c11cbd9 100644
--- a/topbar.js
+++ b/topbar.js
@@ -370,11 +370,12 @@ class WorkspaceMenu extends PanelMenu.Button {
 
 var menu;
 var orginalActivitiesText;
-var screenSignals;
+var screenSignals, signals;
 function init () {
     let label = Main.panel.statusArea.activities.actor.first_child;
     orginalActivitiesText = label.text;
     screenSignals = [];
+    signals = new Utils.Signals();
 }
 
 var panelBoxShowId, panelBoxHideId;
@@ -382,12 +383,18 @@ function enable () {
     Main.panel.statusArea.activities.actor.hide();
 
     menu = new WorkspaceMenu();
+    signals.connect(menu._label, 'notify::allocation', (label) => {
+        let point = new Clutter.Vertex({x: label.x, y: label.y});
+        let r = label.get_parent()
+            .apply_relative_transform_to_point(Main.panel.actor, point);
+
+        for (let [workspace, space] of Tiling.spaces) {
+            space.label.set_position(Math.round(r.x), Math.round(r.y));
+            space.label.show();
+        }
+    });
     Main.panel.addToStatusArea('WorkspaceMenu', menu, 0, 'left');
     menu.actor.show();
-    let id = panelBox.connect('parent-set', (actor) => {
-        actor.disconnect(id);
-        updateWorkspaceIndicator(global.workspaceManager.get_active_workspace());
-    });
 
     // Force transparency
     Main.panel.actor.set_style('background-color: rgba(0, 0, 0, 0.35);');
@@ -400,8 +407,8 @@ function enable () {
                                         updateWorkspaceIndicator(to);
                                     }));
 
-    panelBoxShowId =  panelBox.connect('show', show);
-    panelBoxHideId = panelBox.connect('hide', () => {
+    signals.connect(panelBox, 'show', show);
+    signals.connect(panelBox, 'hide', () => {
         if (display.focus_window.fullscreen) {
             hide();
         } else {
@@ -411,6 +418,7 @@ function enable () {
 }
 
 function disable() {
+    signals.destroy();
     menu.destroy();
     Main.panel.statusArea.activities.actor.show();
     Main.panel.actor.set_style('');
@@ -421,8 +429,6 @@ function disable() {
     screenSignals = [];
 
     panelBox.scale_y = 1;
-    panelBox.disconnect(panelBoxShowId);
-    panelBox.disconnect(panelBoxHideId);
 }
 
 function show() {
@@ -458,28 +464,6 @@ function updateWorkspaceIndicator (index) {
     setWorkspaceName(space.name);
 };
 
-function updateIndicatorPosition(workspace) {
-    if (!menu || !Tiling.spaces)
-        return;
-    let space = Tiling.spaces.spaceOf(workspace);
-    if (!space)
-        return;
-    if (!menu._label)
-        return;
-    space.label.show();
-    let p = menu._label.get_position();
-    let point = new Clutter.Vertex({
-        x: p[0],
-        y: p[1]
-    });
-    if (!menu._label || !menu._label.get_parent())
-        return;
-    let r = menu._label.get_parent().apply_relative_transform_to_point(Main.panel.actor,
-                                                          point);
-
-    space.label.set_position(r.x, r.y);
-}
-
 function setWorkspaceName (name) {
     if (!menu)
         return;