diff --git a/Amethyst/Managers/WindowManager.swift b/Amethyst/Managers/WindowManager.swift
index bd23d4e8..e2716cf6 100644
--- a/Amethyst/Managers/WindowManager.swift
+++ b/Amethyst/Managers/WindowManager.swift
@@ -281,6 +281,9 @@ extension WindowManager {
         guard windows.windows(onScreen: screen).contains(focusedWindow) else {
             let windowChange: Change<Window> = .add(window: focusedWindow)
             add(window: focusedWindow)
+            guard windows.window(withID: focusedWindow.id()) != nil else {
+                return
+            }
             windows.setFloating(false, forWindow: focusedWindow)
             markScreen(screen, forReflowWithChange: windowChange)
             return