diff --git a/packages/desktop-client/src/components/common/CustomSelect.tsx b/packages/desktop-client/src/components/common/CustomSelect.tsx
index cafc24f4f593888856e5b7861d7b4edc15e86515..d85ae87143cc93f5bb5cdb3a3f40194e5e2cf938 100644
--- a/packages/desktop-client/src/components/common/CustomSelect.tsx
+++ b/packages/desktop-client/src/components/common/CustomSelect.tsx
@@ -35,7 +35,7 @@ export default function CustomSelect({
         arrow={<ExpandArrow style={{ width: 7, height: 7, paddingTop: 3 }} />}
       />
       <ListboxPopover style={{ zIndex: 10000, outline: 0, borderRadius: 4 }}>
-        <ListboxList style={{ maxHeight: 250, overflowY: 'scroll' }}>
+        <ListboxList style={{ maxHeight: 250, overflowY: 'auto' }}>
           {options.map(([value, label]) => (
             <ListboxOption
               key={value}
diff --git a/upcoming-release-notes/1314.md b/upcoming-release-notes/1314.md
new file mode 100644
index 0000000000000000000000000000000000000000..0a475f9544c482fb6f6841936f39bb53f30603d8
--- /dev/null
+++ b/upcoming-release-notes/1314.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [aleetsaiya]
+---
+
+Fix Custom Select unnecessary disabled scrollbar