diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
index c426452a73..83f2271d43 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
@@ -28,16 +28,19 @@ export const SelectorPopperContent = () => {
       <PrivateWorkspaceItem />
       <StyledDivider />
       <WorkspaceGroupTitle>Workspace</WorkspaceGroupTitle>
-      {workspacesMeta.map(workspace => {
-        return (
-          <WorkspaceItem
-            key={workspace.id}
-            id={workspace.id}
-            name={`workspace-${workspace.id}`}
-            icon={''}
-          />
-        );
-      })}
+      <WorkspaceWrapper>
+        {workspacesMeta.map(workspace => {
+          return (
+            <WorkspaceItem
+              key={workspace.id}
+              id={workspace.id}
+              name={`workspace-${workspace.id}`}
+              icon={''}
+            />
+          );
+        })}
+      </WorkspaceWrapper>
+
       <CreateWorkspaceItem />
       <StyledDivider />
       <ListItem
@@ -68,3 +71,10 @@ const WorkspaceGroupTitle = styled('div')(({ theme }) => {
     padding: '0 12px',
   };
 });
+
+const WorkspaceWrapper = styled('div')(({ theme }) => {
+  return {
+    maxHeight: '200px',
+    overflow: 'auto',
+  };
+});
diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx
index 63bf1f5d9c..33d07e38c2 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx
@@ -12,6 +12,7 @@ import {
 } from './style';
 import { useState } from 'react';
 import { ModalCloseButton } from '@/ui/modal';
+import router from 'next/router';
 
 interface WorkspaceCreateProps {
   open: boolean;
@@ -20,6 +21,7 @@ interface WorkspaceCreateProps {
 
 export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => {
   const [workspaceName, setWorkspaceId] = useState<string>('');
+  const [canCreate, setCanCreate] = useState<boolean>(false);
   const handlerInputChange = (workspaceName: string) => {
     setWorkspaceId(workspaceName);
   };
@@ -41,9 +43,21 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => {
         </StyledInputContent>
         <StyledButtonContent>
           <StyledButton
-            disabled={!workspaceName.length}
+            disabled={!workspaceName.length || canCreate}
             onClick={() => {
-              createWorkspace({ name: workspaceName, avatar: '' });
+              setCanCreate(true);
+              createWorkspace({ name: workspaceName, avatar: '' })
+                .then(data => {
+                  // @ts-ignore
+                  router.push(`/workspace/${data.created_at}`);
+                  onClose();
+                })
+                .catch(err => {
+                  console.log(err, 'err');
+                })
+                .finally(() => {
+                  setCanCreate(false);
+                });
             }}
           >
             Create