diff --git a/lib/extension/window.js b/lib/extension/window.js
index 61820e1e..4f28047e 100644
--- a/lib/extension/window.js
+++ b/lib/extension/window.js
@@ -1241,6 +1241,9 @@ export class WindowManager extends GObject.Object {
   showWindowBorders() {
     let metaWindow = this.focusMetaWindow;
     if (!metaWindow) return;
+    // Right after a workspace switch, focus can still be on a window of the previous workspace:
+    // its border would stay on screen over the new one (#268)
+    if (!metaWindow.located_on_workspace(global.workspace_manager.get_active_workspace())) return;
     let windowActor = metaWindow.get_compositor_private();
     if (!windowActor) return;
     let nodeWindow = this.findNodeWindow(metaWindow);