diff --git a/packages/web/components/elements/DropdownElements.tsx b/packages/web/components/elements/DropdownElements.tsx
index ed8528544..d1fccf24e 100644
--- a/packages/web/components/elements/DropdownElements.tsx
+++ b/packages/web/components/elements/DropdownElements.tsx
@@ -185,6 +185,9 @@ export function Dropdown(
         sideOffset={sideOffset}
         align={align ? align : 'center'}
         alignOffset={alignOffset}
+        onCloseAutoFocus={(event) => {
+          event.preventDefault()
+        }}
       >
         {labelText && <StyledLabel>{labelText}</StyledLabel>}
         {children}
diff --git a/packages/web/components/elements/LabelsPicker.tsx b/packages/web/components/elements/LabelsPicker.tsx
index ac5081184..61aac142d 100644
--- a/packages/web/components/elements/LabelsPicker.tsx
+++ b/packages/web/components/elements/LabelsPicker.tsx
@@ -48,7 +48,7 @@ export const LabelsPicker = (props: LabelsPickerProps): JSX.Element => {
     if (!isTouchScreenDevice() && focused && inputRef.current) {
       inputRef.current.focus()
     }
-  }, [focused])
+  }, [inputRef.current, focused])
 
   const autoComplete = useCallback(() => {
     const lowerCasedValue = inputValue.toLowerCase()
@@ -124,7 +124,7 @@ export const LabelsPicker = (props: LabelsPickerProps): JSX.Element => {
         },
         '&:focus-within': {
           outline: 'none',
-          border: '1px solid $thLibraryMenuUnselected',
+          border: '1px solid #898989',
         },
         '>span': {
           marginTop: '0px',
diff --git a/packages/web/components/templates/article/SetLabelsControl.tsx b/packages/web/components/templates/article/SetLabelsControl.tsx
index c02c8e1e3..087e128e2 100644
--- a/packages/web/components/templates/article/SetLabelsControl.tsx
+++ b/packages/web/components/templates/article/SetLabelsControl.tsx
@@ -241,9 +241,7 @@ export function SetLabelsControl(props: SetLabelsControlProps): JSX.Element {
     props
   const { labels, revalidate } = useGetLabelsQuery()
   // Move focus through the labels list on tab or arrow up/down keys
-  const [focusedIndex, setFocusedIndex] = useState<number | undefined>(
-    undefined
-  )
+  const [focusedIndex, setFocusedIndex] = useState<number | undefined>(0)
 
   useEffect(() => {
     setFocusedIndex(undefined)
diff --git a/packages/web/components/templates/article/SetLabelsModal.tsx b/packages/web/components/templates/article/SetLabelsModal.tsx
index 6945d178d..5b35b9ca1 100644
--- a/packages/web/components/templates/article/SetLabelsModal.tsx
+++ b/packages/web/components/templates/article/SetLabelsModal.tsx
@@ -173,6 +173,7 @@ export function SetLabelsModal(props: SetLabelsModalProps): JSX.Element {
     <ModalRoot defaultOpen onOpenChange={props.onOpenChange}>
       <ModalOverlay />
       <ModalContent
+        tabIndex={0}
         css={{
           border: '1px solid $grayBorder',
           backgroundColor: '$thBackground',