diff --git a/vite/src/views/main-sidebar/components/OrgDropdown.tsx b/vite/src/views/main-sidebar/components/OrgDropdown.tsx
index 6b85ded60..d07b3e092 100644
--- a/vite/src/views/main-sidebar/components/OrgDropdown.tsx
+++ b/vite/src/views/main-sidebar/components/OrgDropdown.tsx
@@ -50,9 +50,7 @@ export const OrgDropdown = () => {
 
   // Exclude the active organization from the orgs list (this makes it easier for users to understand which org is active)
   if (activeOrganization && orgs) {
-    orgs = orgs.filter(
-      (o) => o.id !== activeOrganization.id
-    );
+    orgs = orgs.filter((o) => o.id !== activeOrganization.id);
   }
 
   const [dialogType, setDialogType] = useState<"create" | "manage" | null>(
@@ -61,11 +59,11 @@ export const OrgDropdown = () => {
 
   const { data: session } = useSession();
 
-  //remove the currect active org from the orgs data
-  const inactiveOrgs = useMemo(() => {
-    if (!orgs || !org) return [];
-    return orgs.filter((orgItem: any) => orgItem.id !== org.id);
-  }, [org, orgs]);
+  // //remove the currect active org from the orgs data
+  // const inactiveOrgs = useMemo(() => {
+  //   if (!orgs || !org) return [];
+  //   return orgs.filter((orgItem: any) => orgItem.id !== org.id);
+  // }, [org, orgs]);
 
   // To pre-fetch data
   useMemberships();
@@ -170,24 +168,27 @@ export const OrgDropdown = () => {
                 </div>
               </DropdownMenuItem>
             )}
-            <DropdownMenuSeparator />
-
-            <DropdownMenuSub>
-              <DropdownMenuSubTrigger className="text-t2">
-                Switch Organization
-              </DropdownMenuSubTrigger>
-              <DropdownMenuPortal>
-                <DropdownMenuSubContent className="w-48">
-                  {inactiveOrgs?.map((org) => (
-                    <SwitchOrgItem
-                      key={org.id}
-                      org={org}
-                      setDropdownOpen={setDropdownOpen}
-                    />
-                  ))}
-                </DropdownMenuSubContent>
-              </DropdownMenuPortal>
-            </DropdownMenuSub>
+            {orgs && orgs.length > 0 && (
+              <>
+                <DropdownMenuSeparator />
+                <DropdownMenuSub>
+                  <DropdownMenuSubTrigger className="text-t2">
+                    Switch Organization
+                  </DropdownMenuSubTrigger>
+                  <DropdownMenuPortal>
+                    <DropdownMenuSubContent className="w-48">
+                      {orgs.map((org) => (
+                        <SwitchOrgItem
+                          key={org.id}
+                          org={org}
+                          setDropdownOpen={setDropdownOpen}
+                        />
+                      ))}
+                    </DropdownMenuSubContent>
+                  </DropdownMenuPortal>
+                </DropdownMenuSub>
+              </>
+            )}
           </DropdownMenuGroup>
           <DropdownMenuSeparator />
           <LogOutItem />
@@ -201,8 +202,6 @@ const SwitchOrgItem = ({ org, setDropdownOpen }: any) => {
   const [loading, setLoading] = useState(false);
   const [_, setSearchParams] = useSearchParams();
 
-  const { mutate } = useOrg();
-
   const handleSwitchOrg = async (orgId: string) => {
     setLoading(true);
 
diff --git a/vite/src/views/products/features/components/CreateFeature.tsx b/vite/src/views/products/features/components/CreateFeature.tsx
index 2f59444d5..14f32850b 100644
--- a/vite/src/views/products/features/components/CreateFeature.tsx
+++ b/vite/src/views/products/features/components/CreateFeature.tsx
@@ -90,7 +90,7 @@ export const CreateFeature = ({
 
   return (
     <>
-      <CustomDialogBody>
+      <CustomDialogBody className="overflow-y-auto">
         <DialogHeader>
           <DialogTitle>Create Feature</DialogTitle>
         </DialogHeader>