diff --git a/src/javascript/JContent/actions/createFolderAction/CreateFolderDialog/CreateFolderDialog.jsx b/src/javascript/JContent/actions/createFolderAction/CreateFolderDialog/CreateFolderDialog.jsx
index 446bf0515..894a4aaa3 100644
--- a/src/javascript/JContent/actions/createFolderAction/CreateFolderDialog/CreateFolderDialog.jsx
+++ b/src/javascript/JContent/actions/createFolderAction/CreateFolderDialog/CreateFolderDialog.jsx
@@ -79,7 +79,7 @@ export const CreateFolderDialog = ({path, contentType, onExit}) => {
                 <TextField
                     fullWidth
                     autoFocus
-                    inputProps={{maxLength: 32}}
+                    inputProps={{maxLength: contextJsParameters.config.maxNameSize}}
                     error={Boolean(errMsg)}
                     value={name}
                     id="folder-name"
diff --git a/src/javascript/JContent/actions/renameAction/RenameDialog/RenameDialog.jsx b/src/javascript/JContent/actions/renameAction/RenameDialog/RenameDialog.jsx
index 942a3ae94..d0d7cb33f 100644
--- a/src/javascript/JContent/actions/renameAction/RenameDialog/RenameDialog.jsx
+++ b/src/javascript/JContent/actions/renameAction/RenameDialog/RenameDialog.jsx
@@ -94,7 +94,7 @@ export const RenameDialog = ({path, contentType, onExit}) => {
                 <TextField
                     fullWidth
                     autoFocus
-                    inputProps={{maxLength: 32}}
+                    inputProps={{maxLength: contextJsParameters.config.maxNameSize}}
                     error={Boolean(errMsg)}
                     value={name}
                     id="folder-name"
diff --git a/src/main/resources/configs/jcontent.jsp b/src/main/resources/configs/jcontent.jsp
index a0cfc9712..934b1f43e 100644
--- a/src/main/resources/configs/jcontent.jsp
+++ b/src/main/resources/configs/jcontent.jsp
@@ -3,3 +3,7 @@
 contextJsParameters.config.links['sql2CheatSheet']="<%= SettingsBean.getInstance().getString("sql2CheatSheet.link", null) %>";
 contextJsParameters.config.links['importAcademy']="<%= SettingsBean.getInstance().getString("importAcademy.link", "https://academy.jahia.com/documentation/digital-experience-manager/7.3/modules/content-and-media-manager#exporting_importing_contents") %>";
 contextJsParameters.config.jcontent = <%= new JSONObject(BundleUtils.getOsgiService(ConfigService.class, null).getConfig("org.jahia.modules.jcontent").getRawProperties()).toString() %>;
+<%
+    SettingsBean settingsBean = SettingsBean.getInstance();
+%>
+contextJsParameters.config.maxNameSize=<%= settingsBean.getMaxNameSize() %>;
\ No newline at end of file