diff --git a/src/components/select/select.jsx b/src/components/select/select.jsx
index 035ee1c9..9540e26c 100644
--- a/src/components/select/select.jsx
+++ b/src/components/select/select.jsx
@@ -355,11 +355,14 @@ function SelectOptions( {
 						<div
 							ref={ refs.setFloating }
 							className={ cn(
-								'box-border [&_*]:box-border w-full bg-white outline-none shadow-lg outline outline-1 outline-border-subtle overflow-y-scroll',
+								'box-border [&_*]:box-border w-full bg-white outline-none shadow-lg outline outline-1 outline-border-subtle',
 								combobox &&
 									'grid grid-cols-1 grid-rows-[auto_1fr] divide-y divide-x-0 divide-solid divide-border-subtle',
 								sizeClassNames[ sizeValue ].dropdown,
 								! combobox && 'h-auto',
+								! combobox
+									? 'overflow-y-auto'
+									: 'overflow-hidden',
 								className
 							) }
 							style={ {