diff --git a/packages/atoms/availability-list/components/availability/index.tsx b/packages/atoms/availability-list/components/availability/index.tsx
index c8465ed40e..3be30876de 100644
--- a/packages/atoms/availability-list/components/availability/index.tsx
+++ b/packages/atoms/availability-list/components/availability/index.tsx
@@ -1,15 +1,8 @@
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-} from "@/components/ui/dropdown-menu";
-import { Toaster } from "@/components/ui/toaster";
 import { useToast } from "@/components/ui/use-toast";
 import type { Schedule } from "availability-list";
-import { Globe, MoreHorizontal, Star, Copy, Trash } from "lucide-react";
+import { Controls } from "availability-list/components/controls";
+import { Globe } from "lucide-react";
 import { Fragment } from "react";
 
 import { availabilityAsString } from "@calcom/lib/availability";
@@ -36,6 +29,31 @@ export function Availability({
 }: AvailabilityProps) {
   const { toast } = useToast();
 
+  function handleDelete() {
+    if (!isDeletable) {
+      toast({
+        description: "You are required to have at least one schedule",
+      });
+    } else {
+      deleteFunction({
+        scheduleId: schedule.id,
+      });
+    }
+  }
+
+  function handleSetDefault() {
+    updateDefault({
+      scheduleId: schedule.id,
+      isDefault: true,
+    });
+  }
+
+  function handleDuplicate() {
+    duplicateFunction({
+      scheduleId: schedule.id,
+    });
+  }
+
   return (
     <li key={schedule.id}>
       <div className="hover:bg-muted flex items-center justify-between py-5 ltr:pl-4 rtl:pr-4 sm:ltr:pl-0 sm:rtl:pr-0">
@@ -65,55 +83,12 @@ export function Availability({
             </p>
           </a>
         </div>
-        <DropdownMenu>
-          <DropdownMenuTrigger>
-            <Button type="button" className="mx-5" color="secondary">
-              <MoreHorizontal />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent>
-            {!schedule.isDefault && (
-              <DropdownMenuItem
-                onClick={() => {
-                  updateDefault({
-                    scheduleId: schedule.id,
-                    isDefault: true,
-                  });
-                }}
-                className="min-w-40 focus:ring-mute min-w-40 focus:ring-muted">
-                <Star />
-                Set as default
-              </DropdownMenuItem>
-            )}
-            <DropdownMenuItem
-              className="outline-none"
-              onClick={() => {
-                duplicateFunction({
-                  scheduleId: schedule.id,
-                });
-              }}>
-              <Copy />
-              Duplicate
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              className="min-w-40 focus:ring-muted"
-              onClick={() => {
-                if (!isDeletable) {
-                  toast({
-                    description: "You are required to have at least one schedule",
-                  });
-                } else {
-                  deleteFunction({
-                    scheduleId: schedule.id,
-                  });
-                }
-              }}>
-              <Trash />
-              Delete
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-        <Toaster />
+        <Controls
+          schedule={schedule}
+          handleDelete={handleDelete}
+          handleDuplicate={handleDuplicate}
+          handleSetDefault={handleSetDefault}
+        />
       </div>
     </li>
   );