diff --git a/apps/docs/src/routes/docs/core/components/combobox.mdx b/apps/docs/src/routes/docs/core/components/combobox.mdx
index b4d0eb4f..1154ebdb 100644
--- a/apps/docs/src/routes/docs/core/components/combobox.mdx
+++ b/apps/docs/src/routes/docs/core/components/combobox.mdx
@@ -915,6 +915,7 @@ We expose a CSS custom property `--kb-combobox-content-transform-origin` which c
| removeOnBackspace | `boolean` When `multiple` is true, whether the last selected option should be removed when the user press the Backspace key and the input is empty. |
| allowDuplicateSelectionEvents | `boolean` Whether `onChange` should fire even if the new value is the same as the last. |
| disallowEmptySelection | `boolean` Whether the combobox allows empty selection or not. |
+| closeOnSelection | `boolean` Whether the combobox closes after selection. |
| selectionBehavior | `'toggle' \| 'replace'` How selection should behave in the combobox. |
| virtualized | `boolean` Whether the combobox uses virtual scrolling. |
| modal | `boolean` Whether the combobox should be the only visible content for screen readers, when set to `true`: - interaction with outside elements will be disabled. - scroll will be locked. - focus will be locked inside the combobox content. - elements outside the combobox content will not be visible for screen readers. |
diff --git a/apps/docs/src/routes/docs/core/components/select.mdx b/apps/docs/src/routes/docs/core/components/select.mdx
index 19bcafb7..97e69ff4 100644
--- a/apps/docs/src/routes/docs/core/components/select.mdx
+++ b/apps/docs/src/routes/docs/core/components/select.mdx
@@ -894,6 +894,7 @@ We expose a CSS custom property `--kb-select-content-transform-origin` which can
| onOpenChange | `(open: boolean) => void` Event handler called when the open state of the select changes. |
| allowDuplicateSelectionEvents | `boolean` Whether `onChange` should fire even if the new value is the same as the last. |
| disallowEmptySelection | `boolean` Whether the select allows empty selection or not. |
+| closeOnSelection | `boolean` Whether the select closes after selection. |
| selectionBehavior | `'toggle' \| 'replace'` How selection should behave in the select. |
| virtualized | `boolean` Whether the select uses virtual scrolling. |
| modal | `boolean` Whether the select should be the only visible content for screen readers, when set to `true`: - interaction with outside elements will be disabled. - scroll will be locked. - focus will be locked inside the select content. - elements outside the select content will not be visible for screen readers. |
diff --git a/packages/core/src/combobox/combobox-base.tsx b/packages/core/src/combobox/combobox-base.tsx
index 35aedd26..b048596f 100644
--- a/packages/core/src/combobox/combobox-base.tsx
+++ b/packages/core/src/combobox/combobox-base.tsx
@@ -182,6 +182,9 @@ export interface ComboboxBaseOptions