diff --git a/components/board/group-card.tsx b/components/board/group-card.tsx
index f6385f2..1be4b44 100644
--- a/components/board/group-card.tsx
+++ b/components/board/group-card.tsx
@@ -93,16 +93,16 @@ export function GroupCard({ group }: { group: GroupDTO }) {
         )}
       >
         <div className="flex items-start justify-between gap-1">
-          <div className="flex min-w-0 flex-1 items-start gap-1">
-            <button
-              ref={setActivatorNodeRef}
-              {...attributes}
-              {...listeners}
-              className="mt-1 flex shrink-0 cursor-grab touch-none items-center justify-center text-muted-foreground/60 hover:text-muted-foreground active:cursor-grabbing"
-              aria-label={`Drag to move ${group.title}`}
-            >
+          <div
+            ref={setActivatorNodeRef}
+            {...attributes}
+            {...listeners}
+            className="group flex min-w-0 flex-1 cursor-grab touch-none items-start gap-1 rounded-md outline-none active:cursor-grabbing focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1"
+            aria-label={`Drag to move ${group.title}`}
+          >
+            <span className="mt-1 flex shrink-0 items-center justify-center text-muted-foreground/60 group-hover:text-muted-foreground">
               <GripVertical className="size-4" />
-            </button>
+            </span>
             <h3 className="min-w-0 flex-1 truncate pt-1 text-sm font-semibold">{group.title}</h3>
           </div>
           <div className="flex shrink-0 items-center">