diff --git a/Source/Editor/CustomEditorWindow.cs b/Source/Editor/CustomEditorWindow.cs
index 72c28234d..f28a844ef 100644
--- a/Source/Editor/CustomEditorWindow.cs
+++ b/Source/Editor/CustomEditorWindow.cs
@@ -33,8 +33,8 @@ namespace FlaxEditor
             private void Set(CustomEditorWindow value)
             {
                 _customEditor = value;
-                _presenter.Select(value);
                 _presenter.OverrideEditor = value;
+                _presenter.Select(value);
             }
 
             /// <inheritdoc />
diff --git a/Source/Editor/CustomEditors/CustomEditorPresenter.cs b/Source/Editor/CustomEditors/CustomEditorPresenter.cs
index f441d2928..62db53cab 100644
--- a/Source/Editor/CustomEditors/CustomEditorPresenter.cs
+++ b/Source/Editor/CustomEditors/CustomEditorPresenter.cs
@@ -132,6 +132,8 @@ namespace FlaxEditor.CustomEditors
                 get => _overrideEditor;
                 set
                 {
+                    if (_overrideEditor == value)
+                        return;
                     _overrideEditor = value;
                     RebuildLayout();
                 }
@@ -200,7 +202,6 @@ namespace FlaxEditor.CustomEditors
             protected override void Deinitialize()
             {
                 Editor = null;
-                _overrideEditor = null;
 
                 base.Deinitialize();
             }