diff --git a/src/admin/AdminBatchEditPanelClient.tsx b/src/admin/AdminBatchEditPanelClient.tsx
index df29063e..6c77cdc1 100644
--- a/src/admin/AdminBatchEditPanelClient.tsx
+++ b/src/admin/AdminBatchEditPanelClient.tsx
@@ -55,7 +55,7 @@ export default function AdminBatchEditPanelClient({
     isPerformingSelectEdit ||
     selectedPhotoIds?.length === 0;
 
-  const renderPhotoCTA = () => selectedPhotoIds?.length === 0
+  const renderPhotoCTA = selectedPhotoIds?.length === 0
     ? <>
       <FaArrowDown />
       Select photos below
@@ -64,7 +64,7 @@ export default function AdminBatchEditPanelClient({
       {photosText} selected
     </ResponsiveText>;
 
-  const renderActions = () => isInTagMode
+  const renderActions = isInTagMode
     ? <>
       <LoaderButton
         className="min-h-[2.5rem]"
@@ -166,7 +166,7 @@ export default function AdminBatchEditPanelClient({
           )}
           padding={isInTagMode ? 'tight-cta-right-left' : 'tight-cta-right'}
           cta={<div className="flex items-center gap-1.5 sm:gap-2.5">
-            {renderActions()}
+            {renderActions}
           </div>}
           spaceChildren={false}
           hideIcon
@@ -183,7 +183,7 @@ export default function AdminBatchEditPanelClient({
               hideLabel
             />
             : <div className="text-base flex gap-2 items-center">
-              {renderPhotoCTA()}
+              {renderPhotoCTA}
             </div>}
         </Note>
         {tagErrorMessage &&
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index a3a7f8f2..888ad491 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -18,6 +18,7 @@ export default function Modal({
   anchor = 'center',
   container = true,
   children,
+  noPadding,
   fast,
 }: {
   onClosePath?: string
@@ -26,6 +27,7 @@ export default function Modal({
   anchor?: 'top' | 'center'
   container?: boolean
   children: ReactNode
+  noPadding?: boolean
   fast?: boolean
 }) {
   const router = useRouter();
@@ -83,8 +85,8 @@ export default function Modal({
           key="modalContent"
           className={clsx(
             container && 'w-[calc(100vw-1.5rem)] sm:w-[min(540px,90vw)]',
-            container && 'p-3 rounded-lg',
-            container && 'md:p-4 md:rounded-xl',
+            container && !noPadding && 'p-3 md:p-4',
+            container && 'rounded-lg md:rounded-xl',
             container && 'dark:border dark:border-gray-800',
             'bg-white dark:bg-black',
             className,
diff --git a/src/components/cmdk/CommandKClient.tsx b/src/components/cmdk/CommandKClient.tsx
index 9da4215f..24620170 100644
--- a/src/components/cmdk/CommandKClient.tsx
+++ b/src/components/cmdk/CommandKClient.tsx
@@ -79,6 +79,7 @@ const MINIMUM_QUERY_LENGTH = 2;
 
 type CommandKItem = {
   label: ReactNode
+  explicitKey?: string
   keywords?: string[]
   accessory?: ReactNode
   annotation?: ReactNode
@@ -272,6 +273,7 @@ export default function CommandKClient({
           accessory: <IconLens size={14} className="translate-y-[0.5px]" />,
           items: lenses.map(({ lens, count }) => ({
             label: formatLensText(lens, 'medium'),
+            explicitKey: formatLensText(lens, 'long'),
             annotation: formatCount(count),
             annotationAria: formatCountDescriptive(count),
             path: pathForLens(lens),
@@ -505,45 +507,55 @@ export default function CommandKClient({
       <Modal
         anchor='top'
         onClose={() => setIsOpen?.(false)}
+        noPadding
         fast
       >
-        <div className="space-y-1.5">
-          <div className="relative">
-            <VisuallyHidden.Root>
-              <DialogTitle>{DIALOG_TITLE}</DialogTitle>
-              <DialogDescription>{DIALOG_DESCRIPTION}</DialogDescription>
-            </VisuallyHidden.Root>
-            <Command.Input
-              onChangeCapture={(e) => setQueryLive(e.currentTarget.value)}
-              className={clsx(
-                'w-full min-w-0!',
-                'focus:ring-0',
-                isPlaceholderVisible || isLoading && 'pr-8!',
-                'border-gray-200! dark:border-gray-800!',
-                'focus:border-gray-200 dark:focus:border-gray-800',
-                'placeholder:text-gray-400/80',
-                'dark:placeholder:text-gray-700',
-                'focus:outline-hidden',
-                isPending && 'opacity-20',
-              )}
-              placeholder="Search photos, views, settings ..."
-              disabled={isPending}
-            />
-            {isLoading && !isPending &&
-              <span className={clsx(
-                'absolute top-2.5 right-0 w-8',
-                'flex items-center justify-center translate-y-[2px]',
-              )}>
-                <Spinner size={16} />
-              </span>}
-          </div>
-          <Command.List className={clsx(
-            'relative overflow-y-auto',
-            'max-h-48 sm:max-h-72',
+        <VisuallyHidden.Root>
+          <DialogTitle>{DIALOG_TITLE}</DialogTitle>
+          <DialogDescription>{DIALOG_DESCRIPTION}</DialogDescription>
+        </VisuallyHidden.Root>
+        <div className={clsx(
+          'px-3 md:px-4',
+          'pt-3 md:pt-4',
+        )}>
+          <Command.Input
+            onChangeCapture={(e) => setQueryLive(e.currentTarget.value)}
+            className={clsx(
+              'w-full min-w-0!',
+              'focus:ring-0',
+              isPlaceholderVisible || isLoading && 'pr-8!',
+              'border-gray-200! dark:border-gray-800!',
+              'focus:border-gray-200 dark:focus:border-gray-800',
+              'placeholder:text-gray-400/80',
+              'dark:placeholder:text-gray-700',
+              'focus:outline-hidden',
+              isPending && 'opacity-20',
+            )}
+            placeholder="Search photos, views, settings ..."
+            disabled={isPending}
+          />
+        </div>
+        {isLoading && !isPending &&
+          <span className={clsx(
+            'absolute top-2.5 right-0 w-8',
+            'flex items-center justify-center translate-y-[2px]',
           )}>
-            <Command.Empty className="mt-1 pl-3 text-dim">
-              {isLoading ? 'Searching ...' : 'No results found'}
-            </Command.Empty>
+            <Spinner size={16} />
+          </span>}
+        <Command.List className={clsx(
+          'relative overflow-y-auto',
+          'max-h-48 sm:max-h-72',
+          'mx-3 md:mx-4',
+          'pt-3 md:pt-4',
+          'pb-6 md:pb-8',
+        )} style={{
+          // eslint-disable-next-line max-len
+          maskImage: 'linear-gradient(to bottom, transparent, black 20px, black calc(100% - 20px), transparent)',
+        }}>
+          <Command.Empty className="mt-1 pl-3 text-dim">
+            {isLoading ? 'Searching ...' : 'No results found'}
+          </Command.Empty>
+          <div className="space-y-2.5">
             {queriedSections
               .concat(categorySections)
               .concat(sectionPages)
@@ -555,7 +567,7 @@ export default function CommandKClient({
                   key={heading}
                   heading={<div className={clsx(
                     'flex items-center',
-                    'px-2',
+                    'px-2 pb-0.5',
                     isPending && 'opacity-20',
                   )}>
                     {accessory &&
@@ -574,6 +586,7 @@ export default function CommandKClient({
                 >
                   {items.map(({
                     label,
+                    explicitKey,
                     keywords,
                     accessory,
                     annotation,
@@ -581,7 +594,7 @@ export default function CommandKClient({
                     path,
                     action,
                   }) => {
-                    const key = `${heading} ${label}`;
+                    const key = `${heading} ${explicitKey ?? label}`;
                     return <CommandKItem
                       key={key}
                       label={label}
@@ -612,12 +625,12 @@ export default function CommandKClient({
                     />;
                   })}
                 </Command.Group>)}
-            {footer && !queryLive &&
-              <div className="text-center text-dim pt-3 sm:pt-4">
-                {footer}
-              </div>}
-          </Command.List>
-        </div>
+          </div>
+          {footer && !queryLive &&
+            <div className="text-center text-base text-dim pt-3 sm:pt-4">
+              {footer}
+            </div>}
+        </Command.List>
       </Modal>
     </Command.Dialog>
   );