diff --git a/README.md b/README.md
index 40fdc65..9056e81 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <img src="./website/public/og.png" />
 </p>
 
-# ⌘K ![cmdk minzip package size](https://img.shields.io/bundlephobia/minzip/cmdk) ![cmdk package version](https://img.shields.io/npm/v/cmdk.svg?colorB=green)
+# ⌘K [![cmdk minzip package size](https://img.shields.io/bundlephobia/minzip/cmdk)](https://www.npmjs.com/package/cmdk?activeTab=code) [![cmdk package version](https://img.shields.io/npm/v/cmdk.svg?colorB=green)](https://www.npmjs.com/package/cmdk)
 
 ⌘K is a command menu React component that can also be used as an accessible combobox. You render items, it filters and sorts them automatically. ⌘K supports a fully composable API <sup>[How?](/ARCHITECTURE.md)</sup>, so you can wrap items in other components or even as static JSX.
 
@@ -51,7 +51,8 @@ const CommandMenu = () => {
   // Toggle the menu when ⌘K is pressed
   React.useEffect(() => {
     const down = (e) => {
-      if (e.key === 'k' && e.metaKey) {
+      if (e.key === 'k' && (e.metaKey || e.ctrlKey)) {
+        e.preventDefault()
         setOpen((open) => !open)
       }
     }
@@ -135,7 +136,9 @@ Or disable filtering and sorting entirely:
 
 You can make the arrow keys wrap around the list (when you reach the end, it goes back to the first item) by setting the `loop` prop:
 
+```tsx
 <Command loop />
+```
 
 ### Dialog `[cmdk-dialog]` `[cmdk-overlay]`
 
@@ -196,7 +199,7 @@ To scroll item into view earlier near the edges of the viewport, use scroll-padd
 }
 ```
 
-### Item `[cmdk-item]` `[aria-disabled?]` `[aria-selected?]`
+### Item `[cmdk-item]` `[data-disabled?]` `[data-selected?]`
 
 Item that becomes active on pointer enter. You should provide a unique `value` for each item, but it will be automatically inferred from the `.textContent`.
 
@@ -209,6 +212,8 @@ Item that becomes active on pointer enter. You should provide a unique `value` f
 </Command.Item>
 ```
 
+You can force an item to always render, regardless of filtering, by passing the `forceMount` prop.
+
 ### Group `[cmdk-group]` `[hidden?]`
 
 Groups items together with the given `heading` (`[cmdk-group-heading]`).
@@ -221,6 +226,8 @@ Groups items together with the given `heading` (`[cmdk-group-heading]`).
 
 Groups will not unmount from the DOM, rather the `hidden` attribute is applied to hide it from view. This may be relevant in your styling.
 
+You can force a group to always render, regardless of filtering, by passing the `forceMount` prop.
+
 ### Separator `[cmdk-separator]`
 
 Visible when the search query is empty or `alwaysRender` is true, hidden otherwise.
diff --git a/cmdk/package.json b/cmdk/package.json
index 8fcec53..f4b5a87 100644
--- a/cmdk/package.json
+++ b/cmdk/package.json
@@ -19,8 +19,7 @@
     "react-dom": "^18.0.0"
   },
   "dependencies": {
-    "@radix-ui/react-dialog": "1.0.0",
-    "command-score": "0.1.2"
+    "@radix-ui/react-dialog": "1.0.0"
   },
   "devDependencies": {
     "@types/react": "18.0.15"
diff --git a/cmdk/src/command-score.ts b/cmdk/src/command-score.ts
new file mode 100644
index 0000000..f79cccc
--- /dev/null
+++ b/cmdk/src/command-score.ts
@@ -0,0 +1,161 @@
+// The scores are arranged so that a continuous match of characters will
+// result in a total score of 1.
+//
+// The best case, this character is a match, and either this is the start
+// of the string, or the previous character was also a match.
+var SCORE_CONTINUE_MATCH = 1,
+  // A new match at the start of a word scores better than a new match
+  // elsewhere as it's more likely that the user will type the starts
+  // of fragments.
+  // NOTE: We score word jumps between spaces slightly higher than slashes, brackets
+  // hyphens, etc.
+  SCORE_SPACE_WORD_JUMP = 0.9,
+  SCORE_NON_SPACE_WORD_JUMP = 0.8,
+  // Any other match isn't ideal, but we include it for completeness.
+  SCORE_CHARACTER_JUMP = 0.17,
+  // If the user transposed two letters, it should be significantly penalized.
+  //
+  // i.e. "ouch" is more likely than "curtain" when "uc" is typed.
+  SCORE_TRANSPOSITION = 0.1,
+  // The goodness of a match should decay slightly with each missing
+  // character.
+  //
+  // i.e. "bad" is more likely than "bard" when "bd" is typed.
+  //
+  // This will not change the order of suggestions based on SCORE_* until
+  // 100 characters are inserted between matches.
+  PENALTY_SKIPPED = 0.999,
+  // The goodness of an exact-case match should be higher than a
+  // case-insensitive match by a small amount.
+  //
+  // i.e. "HTML" is more likely than "haml" when "HM" is typed.
+  //
+  // This will not change the order of suggestions based on SCORE_* until
+  // 1000 characters are inserted between matches.
+  PENALTY_CASE_MISMATCH = 0.9999,
+  // Match higher for letters closer to the beginning of the word
+  PENALTY_DISTANCE_FROM_START = 0.9,
+  // If the word has more characters than the user typed, it should
+  // be penalised slightly.
+  //
+  // i.e. "html" is more likely than "html5" if I type "html".
+  //
+  // However, it may well be the case that there's a sensible secondary
+  // ordering (like alphabetical) that it makes sense to rely on when
+  // there are many prefix matches, so we don't make the penalty increase
+  // with the number of tokens.
+  PENALTY_NOT_COMPLETE = 0.99
+
+var IS_GAP_REGEXP = /[\\\/_+.#"@\[\(\{&]/,
+  COUNT_GAPS_REGEXP = /[\\\/_+.#"@\[\(\{&]/g,
+  IS_SPACE_REGEXP = /[\s-]/,
+  COUNT_SPACE_REGEXP = /[\s-]/g
+
+function commandScoreInner(
+  string,
+  abbreviation,
+  lowerString,
+  lowerAbbreviation,
+  stringIndex,
+  abbreviationIndex,
+  memoizedResults,
+) {
+  if (abbreviationIndex === abbreviation.length) {
+    if (stringIndex === string.length) {
+      return SCORE_CONTINUE_MATCH
+    }
+    return PENALTY_NOT_COMPLETE
+  }
+
+  var memoizeKey = `${stringIndex},${abbreviationIndex}`
+  if (memoizedResults[memoizeKey] !== undefined) {
+    return memoizedResults[memoizeKey]
+  }
+
+  var abbreviationChar = lowerAbbreviation.charAt(abbreviationIndex)
+  var index = lowerString.indexOf(abbreviationChar, stringIndex)
+  var highScore = 0
+
+  var score, transposedScore, wordBreaks, spaceBreaks
+
+  while (index >= 0) {
+    score = commandScoreInner(
+      string,
+      abbreviation,
+      lowerString,
+      lowerAbbreviation,
+      index + 1,
+      abbreviationIndex + 1,
+      memoizedResults,
+    )
+    if (score > highScore) {
+      if (index === stringIndex) {
+        score *= SCORE_CONTINUE_MATCH
+      } else if (IS_GAP_REGEXP.test(string.charAt(index - 1))) {
+        score *= SCORE_NON_SPACE_WORD_JUMP
+        wordBreaks = string.slice(stringIndex, index - 1).match(COUNT_GAPS_REGEXP)
+        if (wordBreaks && stringIndex > 0) {
+          score *= Math.pow(PENALTY_SKIPPED, wordBreaks.length)
+        }
+      } else if (IS_SPACE_REGEXP.test(string.charAt(index - 1))) {
+        score *= SCORE_SPACE_WORD_JUMP
+        spaceBreaks = string.slice(stringIndex, index - 1).match(COUNT_SPACE_REGEXP)
+        if (spaceBreaks && stringIndex > 0) {
+          score *= Math.pow(PENALTY_SKIPPED, spaceBreaks.length)
+        }
+      } else {
+        score *= SCORE_CHARACTER_JUMP
+        if (stringIndex > 0) {
+          score *= Math.pow(PENALTY_SKIPPED, index - stringIndex)
+        }
+      }
+
+      if (string.charAt(index) !== abbreviation.charAt(abbreviationIndex)) {
+        score *= PENALTY_CASE_MISMATCH
+      }
+    }
+
+    if (
+      (score < SCORE_TRANSPOSITION &&
+        lowerString.charAt(index - 1) === lowerAbbreviation.charAt(abbreviationIndex + 1)) ||
+      (lowerAbbreviation.charAt(abbreviationIndex + 1) === lowerAbbreviation.charAt(abbreviationIndex) && // allow duplicate letters. Ref #7428
+        lowerString.charAt(index - 1) !== lowerAbbreviation.charAt(abbreviationIndex))
+    ) {
+      transposedScore = commandScoreInner(
+        string,
+        abbreviation,
+        lowerString,
+        lowerAbbreviation,
+        index + 1,
+        abbreviationIndex + 2,
+        memoizedResults,
+      )
+
+      if (transposedScore * SCORE_TRANSPOSITION > score) {
+        score = transposedScore * SCORE_TRANSPOSITION
+      }
+    }
+
+    if (score > highScore) {
+      highScore = score
+    }
+
+    index = lowerString.indexOf(abbreviationChar, index + 1)
+  }
+
+  memoizedResults[memoizeKey] = highScore
+  return highScore
+}
+
+function formatInput(string) {
+  // convert all valid space characters to space so they match each other
+  return string.toLowerCase().replace(COUNT_SPACE_REGEXP, ' ')
+}
+
+export function commandScore(string: string, abbreviation: string): number {
+  /* NOTE:
+   * in the original, we used to do the lower-casing on each recursive call, but this meant that toLowerCase()
+   * was the dominating cost in the algorithm, passing both is a little ugly, but considerably faster.
+   */
+  return commandScoreInner(string, abbreviation, formatInput(string), formatInput(abbreviation), 0, 0, {})
+}
diff --git a/cmdk/src/index.tsx b/cmdk/src/index.tsx
index 51103c9..35f56b6 100644
--- a/cmdk/src/index.tsx
+++ b/cmdk/src/index.tsx
@@ -1,28 +1,33 @@
 import * as RadixDialog from '@radix-ui/react-dialog'
 import * as React from 'react'
-import commandScore from 'command-score'
+import { commandScore } from './command-score'
 
 type Children = { children?: React.ReactNode }
 type DivProps = React.HTMLAttributes<HTMLDivElement>
 
-type LoadingProps = Children & {
-  /** Estimated progress of loading asynchronous options. */
-  progress?: number
-}
+type LoadingProps = Children &
+  DivProps & {
+    /** Estimated progress of loading asynchronous options. */
+    progress?: number
+  }
 type EmptyProps = Children & DivProps & {}
 type SeparatorProps = DivProps & {
   /** Whether this separator should always be rendered. Useful if you disable automatic filtering. */
   alwaysRender?: boolean
 }
-type DialogProps = RadixDialog.DialogProps &
-  CommandProps & {
-    /** Provide a className to the Dialog overlay. */
-    overlayClassName?: string
-    /** Provide a className to the Dialog content. */
-    contentClassName?: string
-    /** Provide a custom element the Dialog should portal into. */
-    container?: HTMLElement
-  }
+type CommonDialogProps = {
+  /** Provide a className to the Dialog overlay. */
+  overlayClassName?: string
+  /** Provide a className to the Dialog content. */
+  contentClassName?: string
+  /** Provide a custom element the Dialog should portal into. */
+  container?: HTMLElement
+}
+type DialogProps = RadixDialog.DialogProps & CommandProps & CommonDialogProps
+type DialogPortalWrapperProps = RadixDialog.DialogPortalProps & CommandProps & CommonDialogProps
+type DialogPortalProps = {
+  ref: React.ForwardedRef<HTMLDivElement>
+} & (DialogProps | DialogPortalWrapperProps)
 type ListProps = Children & DivProps & {}
 type ItemProps = Children &
   Omit<DivProps, 'disabled' | 'onSelect' | 'value'> & {
@@ -74,6 +79,10 @@ type CommandProps = Children &
      * By default, uses the `command-score` library.
      */
     filter?: (value: string, search: string) => number
+    /**
+     * Optional default item value when it is initially rendered.
+     */
+    defaultValue?: string
     /**
      * Optional controlled state of the selected command menu item.
      */
@@ -111,6 +120,10 @@ type Store = {
   setState: <K extends keyof State>(key: K, value: State[K], opts?: any) => void
   emit: () => void
 }
+type Group = {
+  id: string
+  forceMount?: boolean
+}
 
 const LIST_SELECTOR = `[cmdk-list-sizer=""]`
 const GROUP_SELECTOR = `[cmdk-group=""]`
@@ -129,7 +142,7 @@ const useCommand = () => React.useContext(CommandContext)
 const StoreContext = React.createContext<Store>(undefined)
 const useStore = () => React.useContext(StoreContext)
 // @ts-ignore
-const GroupContext = React.createContext<string>(undefined)
+const GroupContext = React.createContext<Group>(undefined)
 
 const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwardedRef) => {
   const ref = React.useRef<HTMLDivElement>(null)
@@ -137,7 +150,7 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
     /** Value of the search query. */
     search: '',
     /** Currently selected item value. */
-    value: props.value ?? '',
+    value: props.value ?? props.defaultValue?.toLowerCase() ?? '',
     filtered: {
       /** The count of all visible items. */
       count: 0,
@@ -581,12 +594,13 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
 const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) => {
   const id = React.useId()
   const ref = React.useRef<HTMLDivElement>(null)
-  const groupId = React.useContext(GroupContext)
+  const groupContext = React.useContext(GroupContext)
   const context = useCommand()
   const propsRef = useAsRef(props)
+  const forceMount = propsRef.current?.forceMount ?? groupContext?.forceMount
 
   useLayoutEffect(() => {
-    return context.item(id, groupId)
+    return context.item(id, groupContext?.id)
   }, [])
 
   const value = useValue(id, ref, [props.value, props.children, ref])
@@ -594,13 +608,7 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
   const store = useStore()
   const selected = useCmdk((state) => state.value && state.value === value.current)
   const render = useCmdk((state) =>
-    props.forceMount
-      ? true
-      : context.filter() === false
-      ? true
-      : !state.search
-      ? true
-      : state.filtered.items.get(id) > 0,
+    forceMount ? true : context.filter() === false ? true : !state.search ? true : state.filtered.items.get(id) > 0,
   )
 
   React.useEffect(() => {
@@ -632,6 +640,7 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
       role="option"
       aria-disabled={disabled || undefined}
       aria-selected={selected || undefined}
+      data-disabled={disabled || undefined}
       data-selected={selected || undefined}
       onPointerMove={disabled ? undefined : select}
       onClick={disabled ? undefined : onSelect}
@@ -646,14 +655,14 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
  * Grouped items are always shown together.
  */
 const Group = React.forwardRef<HTMLDivElement, GroupProps>((props, forwardedRef) => {
-  const { heading, children, ...etc } = props
+  const { heading, children, forceMount, ...etc } = props
   const id = React.useId()
   const ref = React.useRef<HTMLDivElement>(null)
   const headingRef = React.useRef<HTMLDivElement>(null)
   const headingId = React.useId()
   const context = useCommand()
   const render = useCmdk((state) =>
-    props.forceMount ? true : context.filter() === false ? true : !state.search ? true : state.filtered.groups.has(id),
+    forceMount ? true : context.filter() === false ? true : !state.search ? true : state.filtered.groups.has(id),
   )
 
   useLayoutEffect(() => {
@@ -662,7 +671,8 @@ const Group = React.forwardRef<HTMLDivElement, GroupProps>((props, forwardedRef)
 
   useValue(id, ref, [props.value, props.heading, headingRef])
 
-  const inner = <GroupContext.Provider value={id}>{children}</GroupContext.Provider>
+  const contextValue = React.useMemo(() => ({ id, forceMount }), [forceMount])
+  const inner = <GroupContext.Provider value={contextValue}>{children}</GroupContext.Provider>
 
   return (
     <div
@@ -765,7 +775,7 @@ const List = React.forwardRef<HTMLDivElement, ListProps>((props, forwardedRef) =
       let animationFrame
       const observer = new ResizeObserver(() => {
         animationFrame = requestAnimationFrame(() => {
-          const height = el.getBoundingClientRect().height
+          const height = el.offsetHeight
           wrapper.style.setProperty(`--cmdk-list-height`, height.toFixed(1) + 'px')
         })
       })
@@ -794,6 +804,17 @@ const List = React.forwardRef<HTMLDivElement, ListProps>((props, forwardedRef) =
   )
 })
 
+const DialogPortal = ({ overlayClassName, contentClassName, container, label, ref, ...etc }: DialogPortalProps) => {
+  return (
+    <RadixDialog.Portal container={container}>
+      <RadixDialog.Overlay cmdk-overlay="" className={overlayClassName} />
+      <RadixDialog.Content aria-label={label} cmdk-dialog="" className={contentClassName}>
+        <Command ref={ref} {...etc} />
+      </RadixDialog.Content>
+    </RadixDialog.Portal>
+  )
+}
+
 /**
  * Renders the command menu in a Radix Dialog.
  */
@@ -801,16 +822,19 @@ const Dialog = React.forwardRef<HTMLDivElement, DialogProps>((props, forwardedRe
   const { open, onOpenChange, overlayClassName, contentClassName, container, ...etc } = props
   return (
     <RadixDialog.Root open={open} onOpenChange={onOpenChange}>
-      <RadixDialog.Portal container={container}>
-        <RadixDialog.Overlay cmdk-overlay="" className={overlayClassName} />
-        <RadixDialog.Content aria-label={props.label} cmdk-dialog="" className={contentClassName}>
-          <Command ref={forwardedRef} {...etc} />
-        </RadixDialog.Content>
-      </RadixDialog.Portal>
+      <DialogPortal ref={forwardedRef} {...etc} />
     </RadixDialog.Root>
   )
 })
 
+/**
+ * Renders the command menu in a Radix Dialog without the root element
+ */
+const DialogPortalWrapper = React.forwardRef<HTMLDivElement, DialogPortalWrapperProps>((props, forwardedRef) => {
+  const { overlayClassName, contentClassName, container, ...etc } = props
+  return <DialogPortal ref={forwardedRef} {...etc} />
+})
+
 /**
  * Automatically renders when there are no results for the search query.
  */
@@ -855,6 +879,7 @@ const pkg = Object.assign(Command, {
   Group,
   Separator,
   Dialog,
+  DialogPortal: DialogPortalWrapper,
   Empty,
   Loading,
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 324b651..870b215 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,10 +18,8 @@ importers:
     specifiers:
       '@radix-ui/react-dialog': 1.0.0
       '@types/react': 18.0.15
-      command-score: 0.1.2
     dependencies:
       '@radix-ui/react-dialog': 1.0.0_@types+react@18.0.15
-      command-score: 0.1.2
     devDependencies:
       '@types/react': 18.0.15
 
@@ -1440,10 +1438,6 @@ packages:
     resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
     dev: true
 
-  /command-score/0.1.2:
-    resolution: {integrity: sha512-VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w==}
-    dev: false
-
   /commander/4.1.1:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
diff --git a/test/numeric.test.ts b/test/numeric.test.ts
new file mode 100644
index 0000000..28a0a10
--- /dev/null
+++ b/test/numeric.test.ts
@@ -0,0 +1,25 @@
+import { expect, test } from '@playwright/test'
+
+test.describe('behavior for numeric values', async () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/numeric')
+  })
+
+  test('items filter correctly on numeric inputs', async ({ page }) => {
+    const input = page.locator(`[cmdk-input]`)
+    await input.type('112')
+    const removed = page.locator(`[cmdk-item][data-value="removed"]`)
+    const remains = page.locator(`[cmdk-item][data-value="foo.bar112.value"]`)
+    await expect(removed).toHaveCount(0)
+    await expect(remains).toHaveCount(1)
+  })
+
+  test('items filter correctly on non-numeric inputs', async ({ page }) => {
+    const input = page.locator(`[cmdk-input]`)
+    await input.type('bar')
+    const removed = page.locator(`[cmdk-item][data-value="removed"]`)
+    const remains = page.locator(`[cmdk-item][data-value="foo.bar112.value"]`)
+    await expect(removed).toHaveCount(0)
+    await expect(remains).toHaveCount(1)
+  })
+})
diff --git a/test/pages/numeric.tsx b/test/pages/numeric.tsx
new file mode 100644
index 0000000..e05ad7e
--- /dev/null
+++ b/test/pages/numeric.tsx
@@ -0,0 +1,22 @@
+import { Command } from 'cmdk'
+
+const Page = () => {
+  return (
+    <div>
+      <Command className="root">
+        <Command.Input placeholder="Search…" className="input" />
+        <Command.List className="list">
+          <Command.Empty className="empty">No results.</Command.Empty>
+          <Command.Item value="removed" className="item">
+            To be removed
+          </Command.Item>
+          <Command.Item value="foo.bar112.value" className="item">
+            Not to be removed
+          </Command.Item>
+        </Command.List>
+      </Command>
+    </div>
+  )
+}
+
+export default Page
diff --git a/website/styles/cmdk/framer.scss b/website/styles/cmdk/framer.scss
index 687306c..639007c 100644
--- a/website/styles/cmdk/framer.scss
+++ b/website/styles/cmdk/framer.scss
@@ -63,7 +63,7 @@
     transition: all 150ms ease;
     transition-property: none;
 
-    &[aria-selected='true'] {
+    &[data-selected='true'] {
       background: var(--blue9);
       color: #ffffff;
 
@@ -72,7 +72,7 @@
       }
     }
 
-    &[aria-disabled='true'] {
+    &[data-disabled='true'] {
       color: var(--gray8);
       cursor: not-allowed;
     }
diff --git a/website/styles/cmdk/linear.scss b/website/styles/cmdk/linear.scss
index 89493df..f344f87 100644
--- a/website/styles/cmdk/linear.scss
+++ b/website/styles/cmdk/linear.scss
@@ -75,7 +75,7 @@
     transition-property: none;
     position: relative;
 
-    &[aria-selected='true'] {
+    &[data-selected='true'] {
       background: var(--gray3);
 
       svg {
@@ -93,7 +93,7 @@
       }
     }
 
-    &[aria-disabled='true'] {
+    &[data-disabled='true'] {
       color: var(--gray8);
       cursor: not-allowed;
     }
diff --git a/website/styles/cmdk/raycast.scss b/website/styles/cmdk/raycast.scss
index 07283f5..b69a411 100644
--- a/website/styles/cmdk/raycast.scss
+++ b/website/styles/cmdk/raycast.scss
@@ -148,12 +148,12 @@
     transition: all 150ms ease;
     transition-property: none;
 
-    &[aria-selected='true'] {
+    &[data-selected='true'] {
       background: var(--gray4);
       color: var(--gray12);
     }
 
-    &[aria-disabled='true'] {
+    &[data-disabled='true'] {
       color: var(--gray8);
       cursor: not-allowed;
     }
diff --git a/website/styles/cmdk/vercel.scss b/website/styles/cmdk/vercel.scss
index 9d3e55e..78baf0f 100644
--- a/website/styles/cmdk/vercel.scss
+++ b/website/styles/cmdk/vercel.scss
@@ -66,12 +66,12 @@
     transition: all 150ms ease;
     transition-property: none;
 
-    &[aria-selected='true'] {
+    &[data-selected='true'] {
       background: var(--grayA3);
       color: var(--gray12);
     }
 
-    &[aria-disabled='true'] {
+    &[data-disabled='true'] {
       color: var(--gray8);
       cursor: not-allowed;
     }