diff --git a/src/logic/Window.swift b/src/logic/Window.swift
index 2f99abe6..1e3b4b5a 100644
--- a/src/logic/Window.swift
+++ b/src/logic/Window.swift
@@ -164,6 +164,9 @@ class Window {
             } else {
                 application.runningApplication.activate(options: .activateIgnoringOtherApps)
             }
+        } else if let bundleID = application.runningApplication.bundleIdentifier, bundleID == App.id {
+            App.shared.activate(ignoringOtherApps: true)
+            App.app.window(withWindowNumber: Int(cgWindowId))?.makeKeyAndOrderFront(nil)
         } else {
             // macOS bug: when switching to a System Preferences window in another space, it switches to that space,
             // but quickly switches back to another window in that space