diff --git a/src/panelManager.js b/src/panelManager.js
index b5197cf..036c491 100755
--- a/src/panelManager.js
+++ b/src/panelManager.js
@@ -340,7 +340,6 @@ export const PanelManager = class {
 
       Main.layoutManager._untrackActor(p)
       Main.layoutManager._untrackActor(p.panelBox)
-      Main.layoutManager.removeChrome(clipContainer)
 
       if (p.isStandalone) {
         p.panelBox.destroy()
@@ -359,6 +358,8 @@ export const PanelManager = class {
           trackFullscreen: true,
         })
       }
+
+      Main.layoutManager.removeChrome(clipContainer)
     })
 
     if (Main.layoutManager.primaryMonitor) {