diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs index 3947430f9..aa1952525 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs @@ -299,7 +299,9 @@ namespace FlaxEditor.GUI.ContextMenu PerformLayout(); if (UseVisibilityControl) { +#if !PLATFORM_SDL _previouslyFocused = parentWin.FocusedControl; +#endif Focus(); OnShow(); } diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs index 2d9daabeb..b08faeec9 100644 --- a/Source/Editor/Windows/ContentWindow.cs +++ b/Source/Editor/Windows/ContentWindow.cs @@ -768,9 +768,11 @@ namespace FlaxEditor.Windows _newElement.Dispose(); _newElement = null; +#if !PLATFORM_SDL // Focus content window Focus(); RootWindow?.Focus(); +#endif } // Refresh database and view now