diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx
index 11aa3de52..2c17e6a24 100644
--- a/packages/app/src/components/create-workspace/index.tsx
+++ b/packages/app/src/components/create-workspace/index.tsx
@@ -58,7 +58,7 @@ export const CreateWorkspaceModal = ({ open, onClose }: ModalProps) => {
               onKeyDown={handleKeyDown}
               placeholder={t('Set a Workspace name')}
               onChange={value => {
-                setWorkspaceName(value);
+                setWorkspaceName(value.slice(0, 15));
               }}
             ></Input>
             <Button