diff --git a/Source/Editor/Windows/Assets/JsonAssetWindow.cs b/Source/Editor/Windows/Assets/JsonAssetWindow.cs
index dc1e1e71f..38acfbe15 100644
--- a/Source/Editor/Windows/Assets/JsonAssetWindow.cs
+++ b/Source/Editor/Windows/Assets/JsonAssetWindow.cs
@@ -307,6 +307,20 @@ namespace FlaxEditor.Windows.Assets
             base.OnAssetLoadFailed();
         }
 
+        /// <inheritdoc />
+        public override void OnLostFocus()
+        {
+            base.OnLostFocus();
+            _optionsCM?.Dispose();
+        }
+
+        /// <inheritdoc />
+        public override void OnExit()
+        {
+            base.OnExit();
+            _optionsCM?.Dispose();
+        }
+
         /// <inheritdoc />
         public override void OnItemReimported(ContentItem item)
         {
@@ -325,6 +339,7 @@ namespace FlaxEditor.Windows.Assets
                 _isRegisteredForScriptsReload = false;
                 ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
             }
+            _optionsCM?.Dispose();
             _typeText = null;
 
             base.OnDestroy();