diff --git a/frontend/src/Editor/Header/EditAppName.jsx b/frontend/src/Editor/Header/EditAppName.jsx
index 4ece167329..097ae8aa31 100644
--- a/frontend/src/Editor/Header/EditAppName.jsx
+++ b/frontend/src/Editor/Header/EditAppName.jsx
@@ -120,8 +120,12 @@ function EditAppName({ appId, appName = '', onNameChanged }) {
       </ToolTip>
       <InfoOrErrorBox
         active={isError || isEditing}
-        message={errorMessage || warningText || 'App name should be unique and max 50 characters'}
-        isWarning={warningText}
+        message={
+          errorMessage || warningText || name.length >= 50
+            ? 'Maximum length has been reached'
+            : 'App name should be unique and max 50 characters'
+        }
+        isWarning={warningText || name.length >= 50}
         isError={isError}
         darkMode={darkMode}
         additionalClassName={isError ? 'error' : ''}
diff --git a/frontend/src/_components/AppModal.jsx b/frontend/src/_components/AppModal.jsx
index 5e5ea64c2e..6ff81c6b79 100644
--- a/frontend/src/_components/AppModal.jsx
+++ b/frontend/src/_components/AppModal.jsx
@@ -159,7 +159,7 @@ export function AppModal({
             >
               {errorText}
             </small>
-          ) : infoText ? (
+          ) : infoText || newAppName.length >= 50 ? (
             <small
               className="tj-input-error"
               style={{
@@ -167,7 +167,7 @@ export function AppModal({
                 color: '#ED5F00',
               }}
             >
-              {infoText}
+              {infoText || 'Maximum length has been reached'}
             </small>
           ) : (
             <small