diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs index e31477ef86f..72edb58c41c 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs @@ -77,7 +77,7 @@ void HandleWindowDidResignKey(object sender, EventArgs args) void HandleWindowDidBecomeKey(object sender, EventArgs args) { - if (CurrentEditor == Window.FirstResponder) + if (Window != null && CurrentEditor == Window.FirstResponder) FocusChanged?.Invoke(this, new BoolEventArgs(true)); } }