diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index d43174cf3..68aa03678 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -799,7 +799,10 @@ namespace FlaxEditor.Windows
             if (proxy == null)
                 throw new ArgumentNullException(nameof(proxy));
 
+            // Setup name
             string name = initialName ?? proxy.NewItemName;
+            if (!proxy.IsFileNameValid(name) || Utilities.Utils.HasInvalidPathChar(name))
+                name = proxy.NewItemName;
 
             // If the proxy can not be created in the current folder, then navigate to the content folder
             if (!proxy.CanCreate(CurrentViewFolder))