diff --git a/src/panel.js b/src/panel.js
index ce65ade..ba5a09e 100644
--- a/src/panel.js
+++ b/src/panel.js
@@ -365,6 +365,8 @@ export const Panel = GObject.registerClass(
       // most repaint requests don't actually require us to repaint anything.
       // This saves significant CPU when repainting the screen.
       this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS)
+
+      if (!Main.layoutManager._startingUp) this._resetGeometry()
     }
 
     disable() {
diff --git a/src/panelManager.js b/src/panelManager.js
index 885f05f..db60755 100755
--- a/src/panelManager.js
+++ b/src/panelManager.js
@@ -645,10 +645,6 @@ export const PanelManager = class {
     this.disable(true)
     this.allPanels = []
     this.enable(true)
-
-    // not ideal, but on startup the panel geometries are updated when the initial
-    // gnome-shell startup is complete, so simulate this here to update as well
-    Main.layoutManager.emit('startup-complete')
   }
 
   _updatePanelElementPositions() {