diff --git a/client/src/components/ContentNavigator/index.ts b/client/src/components/ContentNavigator/index.ts
index 54b6849d8..566b59ccd 100644
--- a/client/src/components/ContentNavigator/index.ts
+++ b/client/src/components/ContentNavigator/index.ts
@@ -227,7 +227,9 @@ class ContentNavigator implements SubscriptionProvider {
               ? Messages.RenameFolderTitle
               : Messages.RenameFileTitle,
             value: resource.name,
-            validateInput: isContainer ? folderValidator : fileValidator,
+            validateInput: isContainer
+              ? (value) => folderValidator(value, this.sourceType)
+              : fileValidator,
           });
           if (!name || name === resource.name) {
             return;