diff --git a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx
index b6a5f7724..208c5a062 100644
--- a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx
+++ b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx
@@ -1,6 +1,5 @@
 import { WebApplicationGroup } from '@/Application/WebApplicationGroup'
 import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
-import { SNLogoFull } from '@standardnotes/icons'
 import { useCallback, useEffect, useState } from 'react'
 import { AccountMenuPane } from '../AccountMenu/AccountMenuPane'
 import MenuPaneSelector from '../AccountMenu/MenuPaneSelector'
@@ -38,12 +37,6 @@ import LinkedItemBubble from '../LinkedItems/LinkedItemBubble'
 import StyledTooltip from '../StyledTooltip/StyledTooltip'
 import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
 
-const Header = () => (
-  <div className="flex items-center border-b border-border p-1 px-3 py-2 text-base font-semibold text-info-contrast">
-    <SNLogoFull className="h-7" />
-  </div>
-)
-
 const ClipperView = ({
   viewControllerManager,
   applicationGroup,
@@ -257,107 +250,73 @@ const ClipperView = ({
 
   if (user && !isEntitledToExtension) {
     return (
-      <>
-        <Header />
-        <div className="px-3 py-3">
-          <div
-            className="mx-auto mb-5 flex h-24 w-24 items-center justify-center rounded-[50%] bg-contrast"
-            aria-hidden={true}
-          >
-            <Icon className={`h-12 w-12 ${PremiumFeatureIconClass}`} size={'custom'} type={PremiumFeatureIconName} />
-          </div>
-          <div className="mb-1 text-center text-lg font-bold">Enable Advanced Features</div>
-          <div className="mb-3 text-center">
-            To take advantage of <span className="font-semibold">Web Clipper</span> and other advanced features, upgrade
-            your current plan.
-          </div>
-          <Button className="mb-2" fullWidth primary onClick={upgradePlan}>
-            Upgrade
-          </Button>
-          <Button fullWidth onClick={showSignOutConfirmation}>
-            Sign out
-          </Button>
+      <div className="px-3 py-3">
+        <div
+          className="mx-auto mb-5 flex h-24 w-24 items-center justify-center rounded-[50%] bg-contrast"
+          aria-hidden={true}
+        >
+          <Icon className={`h-12 w-12 ${PremiumFeatureIconClass}`} size={'custom'} type={PremiumFeatureIconName} />
         </div>
-      </>
+        <div className="mb-1 text-center text-lg font-bold">Enable Advanced Features</div>
+        <div className="mb-3 text-center">
+          To take advantage of <span className="font-semibold">Web Clipper</span> and other advanced features, upgrade
+          your current plan.
+        </div>
+        <Button className="mb-2" fullWidth primary onClick={upgradePlan}>
+          Upgrade
+        </Button>
+        <Button fullWidth onClick={showSignOutConfirmation}>
+          Sign out
+        </Button>
+      </div>
     )
   }
 
   if (clippedNote) {
     return (
-      <>
-        <Header />
-        <ClippedNoteView
-          note={clippedNote}
-          key={clippedNote.uuid}
-          linkingController={viewControllerManager.linkingController}
-          clearClip={clearClip}
-          isFirefoxPopup={isFirefoxPopup}
-        />
-      </>
+      <ClippedNoteView
+        note={clippedNote}
+        key={clippedNote.uuid}
+        linkingController={viewControllerManager.linkingController}
+        clearClip={clearClip}
+        isFirefoxPopup={isFirefoxPopup}
+      />
     )
   }
 
   if (!user) {
-    return (
-      <>
-        <Header />
-        {menuPane ? (
-          <div className="py-1">
-            <MenuPaneSelector
-              viewControllerManager={viewControllerManager}
-              application={application}
-              mainApplicationGroup={applicationGroup}
-              menuPane={menuPane}
-              setMenuPane={setMenuPane}
-              closeMenu={() => setMenuPane(undefined)}
-            />
-          </div>
-        ) : (
-          <Menu a11yLabel="User account menu" isOpen={true}>
-            <MenuItem onClick={activateRegisterPane}>
-              <Icon type="user" className="mr-2 h-6 w-6 text-neutral md:h-5 md:w-5" />
-              Create free account
-            </MenuItem>
-            <MenuItem onClick={activateSignInPane}>
-              <Icon type="signIn" className="mr-2 h-6 w-6 text-neutral md:h-5 md:w-5" />
-              Sign in
-            </MenuItem>
-          </Menu>
-        )}
-      </>
+    return menuPane ? (
+      <div className="py-1">
+        <MenuPaneSelector
+          viewControllerManager={viewControllerManager}
+          application={application}
+          mainApplicationGroup={applicationGroup}
+          menuPane={menuPane}
+          setMenuPane={setMenuPane}
+          closeMenu={() => setMenuPane(undefined)}
+        />
+      </div>
+    ) : (
+      <Menu a11yLabel="User account menu" isOpen={true}>
+        <MenuItem onClick={activateRegisterPane}>
+          <Icon type="user" className="mr-2 h-6 w-6 text-neutral md:h-5 md:w-5" />
+          Create free account
+        </MenuItem>
+        <MenuItem onClick={activateSignInPane}>
+          <Icon type="signIn" className="mr-2 h-6 w-6 text-neutral md:h-5 md:w-5" />
+          Sign in
+        </MenuItem>
+      </Menu>
     )
   }
 
   return (
-    <>
-      <Header />
-      <div>
-        <Menu a11yLabel="Extension menu" isOpen={true} className="pb-1">
-          <MenuItem
-            onClick={async () => {
-              const payload = await sendMessageToActiveTab({ type: RuntimeMessageTypes.GetFullPage })
-              if (!payload) {
-                return
-              }
-              setClipPayload(payload)
-            }}
-          >
-            {isScreenshotMode ? 'Capture visible' : 'Clip full page'}
-          </MenuItem>
+    <div className="bg-contrast p-3">
+      <Menu a11yLabel="Extension menu" isOpen={true} className="rounded border border-border bg-default">
+        {hasSelection && (
           <MenuItem
+            className="border-b border-border"
             disabled={isScreenshotMode}
-            onClick={async () => {
-              const payload = await sendMessageToActiveTab({ type: RuntimeMessageTypes.GetArticle })
-              if (!payload) {
-                return
-              }
-              setClipPayload(payload)
-            }}
-          >
-            Clip article
-          </MenuItem>
-          <MenuItem
-            disabled={!hasSelection || isScreenshotMode}
             onClick={async () => {
               const payload = await sendMessageToActiveTab({ type: RuntimeMessageTypes.GetSelection })
               if (!payload) {
@@ -366,65 +325,96 @@ const ClipperView = ({
               setClipPayload(payload)
             }}
           >
+            <Icon type="paragraph" className="mr-2 text-info" />
             Clip text selection
           </MenuItem>
-          <MenuItem
-            onClick={async () => {
-              void sendMessageToActiveTab({ type: RuntimeMessageTypes.StartNodeSelection })
-              window.close()
-            }}
-          >
-            Select elements to {isScreenshotMode ? 'capture' : 'clip'}
-          </MenuItem>
-          <MenuSwitchButtonItem
-            checked={isScreenshotMode}
-            onChange={function (checked: boolean): void {
-              setIsScreenshotMode(checked)
-            }}
-            className="flex-row-reverse gap-2"
-          >
-            Clip as screenshot
-          </MenuSwitchButtonItem>
-          <div className="border-t border-border px-3 py-3 text-base text-foreground">
-            <div className="flex items-center justify-between">
-              <div className="font-medium">Default tag</div>
-              {defaultTag && (
-                <StyledTooltip label="Remove default tag" gutter={2}>
-                  <button className="rounded-full p-1 hover:bg-contrast hover:text-info" onClick={unselectTag}>
-                    <Icon type="clear-circle-filled" />
-                  </button>
-                </StyledTooltip>
-              )}
+        )}
+        <MenuItem
+          onClick={async () => {
+            const payload = await sendMessageToActiveTab({ type: RuntimeMessageTypes.GetFullPage })
+            if (!payload) {
+              return
+            }
+            setClipPayload(payload)
+          }}
+        >
+          <Icon type="notes-filled" className="mr-2 text-info" />
+          {isScreenshotMode ? 'Capture visible' : 'Clip full page'}
+        </MenuItem>
+        <MenuItem
+          disabled={isScreenshotMode}
+          onClick={async () => {
+            const payload = await sendMessageToActiveTab({ type: RuntimeMessageTypes.GetArticle })
+            if (!payload) {
+              return
+            }
+            setClipPayload(payload)
+          }}
+        >
+          <Icon type="rich-text" className="mr-2 text-info" />
+          Clip article
+        </MenuItem>
+        <MenuItem
+          onClick={async () => {
+            void sendMessageToActiveTab({ type: RuntimeMessageTypes.StartNodeSelection })
+            window.close()
+          }}
+        >
+          <Icon type="dashboard" className="mr-2 text-info" />
+          Select elements to {isScreenshotMode ? 'capture' : 'clip'}
+        </MenuItem>
+        <MenuSwitchButtonItem
+          checked={isScreenshotMode}
+          onChange={function (checked: boolean): void {
+            setIsScreenshotMode(checked)
+          }}
+          className="flex-row-reverse gap-2"
+        >
+          Clip as screenshot
+        </MenuSwitchButtonItem>
+        <div className="border-t border-border px-3 py-3  text-foreground">
+          {defaultTag && (
+            <div className="flex items-center justify-between text-base">
+              <LinkedItemBubble
+                className="m-1 mr-2 min-w-0"
+                link={createLinkFromItem(defaultTag, 'linked')}
+                unlinkItem={unselectTag}
+                isBidirectional={false}
+              />
+              <StyledTooltip label="Remove default tag" gutter={2}>
+                <button
+                  className="rounded-full p-1 text-neutral hover:bg-contrast hover:text-info"
+                  onClick={unselectTag}
+                >
+                  <Icon type="clear-circle-filled" />
+                </button>
+              </StyledTooltip>
             </div>
-            {defaultTag && (
-              <div>
-                <LinkedItemBubble
-                  className="m-1 mr-2"
-                  link={createLinkFromItem(defaultTag, 'linked')}
-                  unlinkItem={unselectTag}
-                  isBidirectional={false}
-                  inlineFlex={true}
-                />
-              </div>
-            )}
-            <ItemSelectionDropdown
-              onSelection={selectTag}
-              placeholder="Select tag to save clipped notes to..."
-              contentTypes={[ContentType.Tag]}
-            />
-          </div>
-          <div className="border-t border-border px-3 pt-3 pb-1 text-base text-foreground">
-            <div>You're signed in as:</div>
-            <div className="wrap my-0.5 font-bold">{user.email}</div>
-            <span className="text-neutral">{application.getHost()}</span>
-          </div>
-          <MenuItem onClick={showSignOutConfirmation}>
-            <Icon type="signOut" className="mr-2 h-6 w-6 text-neutral" />
-            Sign out
-          </MenuItem>
-        </Menu>
-      </div>
-    </>
+          )}
+          <ItemSelectionDropdown
+            onSelection={selectTag}
+            placeholder="Select tag to save clipped notes to..."
+            contentTypes={[ContentType.Tag]}
+            className={{
+              input: 'text-[0.85rem]',
+            }}
+            comboboxProps={{
+              placement: 'top',
+            }}
+          />
+        </div>
+        <div className="flex items-center border-t border-border text-foreground">
+          <Icon type="user" className="mx-2" />
+          <div className="flex-grow py-2 text-sm font-semibold">{user.email}</div>
+          <button
+            className="flex-shrink-0 border-l border-border py-2 px-2 hover:bg-info-backdrop focus:bg-info-backdrop focus:shadow-none focus:outline-none"
+            onClick={showSignOutConfirmation}
+          >
+            <Icon type="signOut" className="text-neutral" />
+          </button>
+        </div>
+      </Menu>
+    </div>
   )
 }
 
diff --git a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
index 56058b922..2a995e922 100644
--- a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
+++ b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
@@ -1,6 +1,13 @@
 import { doesItemMatchSearchQuery } from '@/Utils/Items/Search/doesItemMatchSearchQuery'
-import { Combobox, ComboboxItem, ComboboxPopover, useComboboxStore, VisuallyHidden } from '@ariakit/react'
-import { ContentType, DecryptedItem, naturalSort } from '@standardnotes/snjs'
+import {
+  Combobox,
+  ComboboxItem,
+  ComboboxPopover,
+  ComboboxStoreProps,
+  useComboboxStore,
+  VisuallyHidden,
+} from '@ariakit/react'
+import { classNames, ContentType, DecryptedItem, naturalSort } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
 import { useDeferredValue, useEffect, useState } from 'react'
 import { useApplication } from '../ApplicationProvider'
@@ -10,13 +17,23 @@ type Props = {
   contentTypes: ContentType[]
   placeholder: string
   onSelection: (item: DecryptedItem) => void
+  className?: {
+    input?: string
+    popover?: string
+  }
+  comboboxProps?: ComboboxStoreProps
 }
 
-const ItemSelectionDropdown = ({ contentTypes, placeholder, onSelection }: Props) => {
+const ItemSelectionDropdown = ({ contentTypes, placeholder, onSelection, comboboxProps, className = {} }: Props) => {
   const application = useApplication()
 
-  const combobox = useComboboxStore()
+  const combobox = useComboboxStore(comboboxProps)
   const value = combobox.useState('value')
+  const open = combobox.useState('open')
+  if (value.length < 1 && open) {
+    combobox.setOpen(false)
+  }
+
   const searchQuery = useDeferredValue(value)
   const [items, setItems] = useState<DecryptedItem[]>([])
 
@@ -30,17 +47,21 @@ const ItemSelectionDropdown = ({ contentTypes, placeholder, onSelection }: Props
 
   return (
     <div>
-      <label>
-        <VisuallyHidden>Select an item</VisuallyHidden>
-        <Combobox
-          store={combobox}
-          placeholder={placeholder}
-          className="h-7 w-70 bg-transparent text-sm text-text focus:border-b-2 focus:border-info focus:shadow-none focus:outline-none lg:text-xs"
-        />
-      </label>
+      <VisuallyHidden>Select an item</VisuallyHidden>
+      <Combobox
+        store={combobox}
+        placeholder={placeholder}
+        className={classNames(
+          'h-7 w-70 bg-transparent text-sm text-text focus:border-b-2 focus:border-info focus:shadow-none focus:outline-none lg:text-xs',
+          className.input,
+        )}
+      />
       <ComboboxPopover
         store={combobox}
-        className="z-dropdown-menu max-h-[var(--popover-available-height)] w-[var(--popover-anchor-width)] overflow-y-auto rounded bg-default py-2 shadow-main"
+        className={classNames(
+          'z-dropdown-menu max-h-[var(--popover-available-height)] w-[var(--popover-anchor-width)] overflow-y-auto rounded bg-default py-2 shadow-main',
+          className.popover,
+        )}
       >
         {items.length > 0 ? (
           items.map((item) => (
diff --git a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx
index 4658e410f..f74a28b52 100644
--- a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx
+++ b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx
@@ -41,7 +41,13 @@ const MenuSwitchButtonItem = forwardRef(
           <span className="flex flex-grow items-center">{children}</span>
           <div className="flex items-center">
             {shortcut && <KeyboardShortcutIndicator className="mr-2" shortcut={shortcut} />}
-            <Switch disabled={disabled} className="pointer-events-none px-0" checked={checked} onChange={onChange} />
+            <Switch
+              disabled={disabled}
+              className="pointer-events-none px-0"
+              checked={checked}
+              onChange={onChange}
+              tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
+            />
           </div>
         </button>
       </MenuListItem>
diff --git a/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts b/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts
index 6e44c2dd2..eb714daff 100644
--- a/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts
+++ b/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts
@@ -96,16 +96,16 @@ export const useListKeyboardNavigation = (
 
     const selectedItemIndex = Array.from(items).findIndex((item) => item.dataset.selected)
     let indexToFocus = selectedItemIndex > -1 ? selectedItemIndex : initialFocus
-    indexToFocus = getNextFocusableIndex(indexToFocus, items)
+    indexToFocus = getNextFocusableIndex(indexToFocus - 1, items)
 
-    setTimeout(() => {
-      focusItemWithIndex(indexToFocus, items)
-    }, FIRST_ITEM_FOCUS_TIMEOUT)
+    focusItemWithIndex(indexToFocus, items)
   }, [container, focusItemWithIndex, getNextFocusableIndex, initialFocus])
 
   useEffect(() => {
     if (shouldAutoFocus) {
-      setInitialFocus()
+      setTimeout(() => {
+        setInitialFocus()
+      }, FIRST_ITEM_FOCUS_TIMEOUT)
     }
   }, [setInitialFocus, shouldAutoFocus])