From 215db4243c5fbd3389f589733d286ca09f7737ad Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 3 Sep 2021 14:20:59 +0200
Subject: [PATCH] Ensure key window is a GPUIWindow before returning its id

---
 gpui/src/platform/mac/window.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gpui/src/platform/mac/window.rs b/gpui/src/platform/mac/window.rs
index b1d86acb12..4139842eda 100644
--- a/gpui/src/platform/mac/window.rs
+++ b/gpui/src/platform/mac/window.rs
@@ -245,11 +245,11 @@ impl Window {
         unsafe {
             let app = NSApplication::sharedApplication(nil);
             let key_window: id = msg_send![app, keyWindow];
-            if key_window.is_null() {
-                None
-            } else {
+            if msg_send![key_window, isKindOfClass: WINDOW_CLASS] {
                 let id = get_window_state(&*key_window).borrow().id;
                 Some(id)
+            } else {
+                None
             }
         }
     }