diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs index 42ce0446d..6caf7f651 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs @@ -224,8 +224,12 @@ namespace FlaxEditor.GUI.ContextMenu } // Return focus - _previouslyFocused?.RootWindow?.Focus(); - _previouslyFocused?.Focus(); + if (_previouslyFocused != null) + { + _previouslyFocused.RootWindow?.Focus(); + _previouslyFocused.Focus(); + _previouslyFocused = null; + } // Hide Visible = false;