diff --git a/web/src/components/ui/dropdown/Dropdown.stories.tsx b/web/src/components/ui/dropdown/Dropdown.stories.tsx
index 0785ab380..b7578b4cb 100644
--- a/web/src/components/ui/dropdown/Dropdown.stories.tsx
+++ b/web/src/components/ui/dropdown/Dropdown.stories.tsx
@@ -210,7 +210,7 @@ export const WithSelection: Story = {
       {
         id: '1',
         label: 'Option 1',
-        selected: true,
+        selected: false,
         onClick: () => console.log('Option 1 clicked')
       },
       {
@@ -220,8 +220,9 @@ export const WithSelection: Story = {
       },
       {
         id: '3',
-        label: 'Option 3',
-        onClick: () => console.log('Option 3 clicked')
+        label: 'Option 3 - Selected',
+        onClick: () => console.log('Option 3 clicked'),
+        selected: true
       }
     ],
     children: <Button>Selection Menu</Button>
diff --git a/web/src/components/ui/dropdown/Dropdown.tsx b/web/src/components/ui/dropdown/Dropdown.tsx
index a945f1c77..d853e5dea 100644
--- a/web/src/components/ui/dropdown/Dropdown.tsx
+++ b/web/src/components/ui/dropdown/Dropdown.tsx
@@ -160,6 +160,7 @@ const DropdownItem = ({
     <Wrapper
       items={items}
       disabled={disabled}
+      checked={selected}
       onClick={onClickItem}
       closeOnSelect={closeOnSelect}
       selectType={selectType}>
diff --git a/web/src/components/ui/dropdown/DropdownBase.tsx b/web/src/components/ui/dropdown/DropdownBase.tsx
index 85c699b14..378dc2b4a 100644
--- a/web/src/components/ui/dropdown/DropdownBase.tsx
+++ b/web/src/components/ui/dropdown/DropdownBase.tsx
@@ -105,8 +105,11 @@ DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
 
 const DropdownMenuCheckboxItem = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
->(({ className, children, checked, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem> & {
+    closeOnSelect?: boolean;
+    selectType?: string;
+  }
+>(({ className, children, onClick, checked, closeOnSelect, selectType, ...props }, ref) => (
   <DropdownMenuPrimitive.CheckboxItem
     ref={ref}
     className={cn(
@@ -114,6 +117,13 @@ const DropdownMenuCheckboxItem = React.forwardRef<
       className
     )}
     checked={checked}
+    onClick={(e) => {
+      if (closeOnSelect) {
+        e.stopPropagation();
+        e.preventDefault();
+      }
+      onClick?.(e);
+    }}
     {...props}>
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
       <DropdownMenuPrimitive.ItemIndicator>