diff --git a/Source/Editor/Content/Proxy/CollisionDataProxy.cs b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
index e4a2381f0..55e8c6327 100644
--- a/Source/Editor/Content/Proxy/CollisionDataProxy.cs
+++ b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
@@ -141,13 +141,7 @@ namespace FlaxEditor.Content
                 });
             };
             var initialName = (modelItem?.ShortName ?? Path.GetFileNameWithoutExtension(model.Path)) + " Collision";
-            
-            // If folder can not have assets then move to folder with the model and create asset
-            var contentWin = Editor.Instance.Windows.ContentWin;
-            if (!contentWin.CurrentViewFolder.CanHaveAssets)
-                contentWin.Navigate(modelItem?.ParentFolder?.Node);
-            
-            contentWin.NewItem(this, null, create, initialName, withRenaming);
+            Editor.Instance.Windows.ContentWin.NewItem(this, null, create, initialName, withRenaming);
         }
     }
 }
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 43fd6b648..6a59cb218 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -656,6 +656,11 @@ namespace FlaxEditor.Windows
                 throw new ArgumentNullException(nameof(proxy));
 
             string name = initialName ?? proxy.NewItemName;
+
+            // If the proxy can not be created in the current folder, then navigate to the content folder
+            if (!proxy.CanCreate(CurrentViewFolder))
+                Navigate(Editor.Instance.ContentDatabase.Game.Content);
+
             ContentFolder parentFolder = CurrentViewFolder;
             string parentFolderPath = parentFolder.Path;