diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Select/Select.css b/webapp/common-react/@dbeaver/ui-kit/src/Select/Select.css
index 68ade9a035c..627d97648dd 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Select/Select.css
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Select/Select.css
@@ -28,7 +28,6 @@
 
     &[aria-disabled='true'] {
       opacity: var(--dbv-kit-control-disabled-opacity);
-      color: var(--dbv-kit-select-disabled-foreground);
       background-color: var(--dbv-kit-select-disabled-background);
     }
     &:focus-visible {
diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.css b/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.css
index a2afdbff887..2064e590d23 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.css
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.css
@@ -24,4 +24,8 @@
     color: var(--tw-color-gray-500);
     font-size: var(--dbv-kit-select-font-size);
   }
+
+  .dbv-kit-select[aria-disabled='true'] .dbv-kit-select__arrow-icon {
+    color: var(--dbv-kit-select-disabled-foreground);
+  }
 }
diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.tsx b/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.tsx
index aeee1544149..5f209f49dd3 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.tsx
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Select/SelectField.tsx
@@ -126,7 +126,9 @@ export function SelectField<T, ItemType extends {} = SelectItem<T>>({
     getValueByPath<ItemType, boolean>(item, itemDisabled, i => ('disabled' in i ? Boolean((i as unknown as SelectItem<T>).disabled) : false));
 
   const [selectedValue, setSelectedValue] = useState<T | undefined>(() => {
-    if (value !== undefined) return value;
+    if (value !== undefined) {
+      return value;
+    }
 
     const firstEnabledItem = items.find(item => !isItemDisabled(item));
     return firstEnabledItem ? getItemValue(firstEnabledItem) : undefined;
@@ -161,7 +163,7 @@ export function SelectField<T, ItemType extends {} = SelectItem<T>>({
 
         <Select id={id} name={name} disabled={disabled} required={required}>
           {displayValue}
-          {arrowIcon ?? <Select.Arrow className="dbv-kit-select__arrow-icon" />}
+          {arrowIcon ?? <Select.Arrow className="dbv-kit-select__arrow-icon tw:text-sm!" />}
         </Select>
         {description && <span className="dbv-kit-select__description">{description}</span>}
 
diff --git a/webapp/packages/core-blocks/src/FormControls/Select.css b/webapp/packages/core-blocks/src/FormControls/Select.css
index 78a282d9d76..83192d5e273 100644
--- a/webapp/packages/core-blocks/src/FormControls/Select.css
+++ b/webapp/packages/core-blocks/src/FormControls/Select.css
@@ -40,7 +40,7 @@
 
   .dbv-kit-select {
     padding-left: 12px;
-    padding-right: 4px;
+    padding-right: 6px;
   }
 
   .dbv-kit-select__item {