diff --git a/lib/extension/window.js b/lib/extension/window.js
index b5e60d5..3afb79a 100644
--- a/lib/extension/window.js
+++ b/lib/extension/window.js
@@ -891,16 +891,20 @@ export class WindowManager extends GObject.Object {
     });
   }
 
+  hideActorBorder(actor) {
+    if (actor.border) {
+      actor.border.hide();
+    }
+    if (actor.splitBorder) {
+      actor.splitBorder.hide();
+    }
+  }
+
   hideWindowBorders() {
     this.tree.nodeWindows.forEach((nodeWindow) => {
       let actor = nodeWindow.windowActor;
       if (actor) {
-        if (actor.border) {
-          actor.border.hide();
-        }
-        if (actor.splitBorder) {
-          actor.splitBorder.hide();
-        }
+        this.hideActorBorder(actor);
       }
       if (nodeWindow.parentNode.isTabbed()) {
         if (nodeWindow.tab) {
@@ -1410,6 +1414,9 @@ export class WindowManager extends GObject.Object {
               let from = "size-changed";
               this.updateMetaPositionSize(_metaWindow, from);
             }),
+            metaWindow.connect("unmanaged", (_metaWindow) => {
+              this.hideActorBorder(windowActor);
+            }),
             metaWindow.connect("focus", (_metaWindowFocus) => {
               this.queueEvent({
                 name: "focus-update",