diff --git a/cmdk/src/index.tsx b/cmdk/src/index.tsx
index 3131c7b..91cff99 100644
--- a/cmdk/src/index.tsx
+++ b/cmdk/src/index.tsx
@@ -574,8 +574,8 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
     <Primitive.div
       ref={forwardedRef}
       tabIndex={-1}
-      {...etc}
       cmdk-root=""
+      {...etc}
       onKeyDown={(e) => {
         etc.onKeyDown?.(e)
 
@@ -706,7 +706,6 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
   return (
     <Primitive.div
       ref={composeRefs(ref, forwardedRef)}
-      {...etc}
       id={id}
       cmdk-item=""
       role="option"
@@ -714,6 +713,7 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
       aria-selected={Boolean(selected)}
       data-disabled={Boolean(disabled)}
       data-selected={Boolean(selected)}
+      {...etc}
       onPointerMove={disabled || context.getDisablePointerSelection() ? undefined : select}
       onClick={disabled ? undefined : onSelect}
     >
@@ -748,10 +748,10 @@ const Group = React.forwardRef<HTMLDivElement, GroupProps>((props, forwardedRef)
   return (
     <Primitive.div
       ref={composeRefs(ref, forwardedRef)}
-      {...etc}
       cmdk-group=""
       role="presentation"
       hidden={render ? undefined : true}
+      {...etc}
     >
       {heading && (
         <div ref={headingRef} cmdk-group-heading="" aria-hidden id={headingId}>
@@ -777,7 +777,7 @@ const Separator = React.forwardRef<HTMLDivElement, SeparatorProps>((props, forwa
   const render = useCmdk((state) => !state.search)
 
   if (!alwaysRender && !render) return null
-  return <Primitive.div ref={composeRefs(ref, forwardedRef)} {...etc} cmdk-separator="" role="separator" />
+  return <Primitive.div ref={composeRefs(ref, forwardedRef)} cmdk-separator="" role="separator" {...etc} />
 })
 
 /**
@@ -801,7 +801,6 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, forwardedRe
   return (
     <Primitive.input
       ref={forwardedRef}
-      {...etc}
       cmdk-input=""
       autoComplete="off"
       autoCorrect="off"
@@ -814,6 +813,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, forwardedRe
       aria-activedescendant={selectedItemId}
       id={context.inputId}
       type="text"
+      {...etc}
       value={isControlled ? props.value : search}
       onChange={(e) => {
         if (!isControlled) {
@@ -859,13 +859,13 @@ const List = React.forwardRef<HTMLDivElement, ListProps>((props, forwardedRef) =
   return (
     <Primitive.div
       ref={composeRefs(ref, forwardedRef)}
-      {...etc}
       cmdk-list=""
       role="listbox"
       tabIndex={-1}
       aria-activedescendant={selectedItemId}
       aria-label={label}
       id={context.listId}
+      {...etc}
     >
       {SlottableWithNestedChildren(props, (child) => (
         <div ref={composeRefs(height, context.listInnerRef)} cmdk-list-sizer="">
@@ -900,7 +900,7 @@ const Empty = React.forwardRef<HTMLDivElement, EmptyProps>((props, forwardedRef)
   const render = useCmdk((state) => state.filtered.count === 0)
 
   if (!render) return null
-  return <Primitive.div ref={forwardedRef} {...props} cmdk-empty="" role="presentation" />
+  return <Primitive.div ref={forwardedRef} cmdk-empty="" role="presentation" {...props} />
 })
 
 /**
@@ -912,13 +912,13 @@ const Loading = React.forwardRef<HTMLDivElement, LoadingProps>((props, forwarded
   return (
     <Primitive.div
       ref={forwardedRef}
-      {...etc}
       cmdk-loading=""
       role="progressbar"
       aria-valuenow={progress}
       aria-valuemin={0}
       aria-valuemax={100}
       aria-label={label}
+      {...etc}
     >
       {SlottableWithNestedChildren(props, (child) => (
         <div aria-hidden>{child}</div>