diff --git a/src/Filee.App/Styles/Soft.axaml b/src/Filee.App/Styles/Soft.axaml
index d6b28b2c..1683ce1b 100644
--- a/src/Filee.App/Styles/Soft.axaml
+++ b/src/Filee.App/Styles/Soft.axaml
@@ -236,12 +236,32 @@
   <Style Selector="ListBox.soft ListBoxItem">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
     <Setter Property="Padding" Value="10,7" />
-    <Setter Property="Margin" Value="0,1" />
+    <!-- 16px on the right is kept free for the scrollbar (it floats over the list and grows on hover), so the
+         selected / hovered row ends before it. -->
+    <Setter Property="Margin" Value="0,1,16,1" />
   </Style>
   <Style Selector="ListBox.soft ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />
   </Style>
 
+  <!-- ───────── Dropdown lists (ComboBox): rows are rounded and inset, so the selected / hovered row sits inside the
+       rounded popup instead of poking out of its corners. The popup takes the Softness radius (SoftRadius) and the
+       rows the smaller one (SoftRadiusSmall), so both follow the Theme page's Softness, down to sharp corners. ───────── -->
+  <Style Selector="ComboBox /template/ Border#PopupBorder">
+    <Setter Property="CornerRadius" Value="{DynamicResource SoftRadius}" />
+    <Setter Property="Padding" Value="6" />
+  </Style>
+  <Style Selector="ComboBoxItem">
+    <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
+    <Setter Property="Margin" Value="0,1" />
+  </Style>
+  <!-- The popup's scrollbar takes its own column (only when the list is long enough to need one), so the selected /
+       hovered row ends before it and a short dropdown keeps its full width. -->
+  <Style Selector="ComboBox /template/ ScrollViewer">
+    <Setter Property="AllowAutoHide" Value="False" />
+  </Style>
+
+
   <!-- ───────── Page content fade-in (keyframes can't animate RenderTransform, so Margin slides) ───────── -->
   <Style Selector="ContentControl.page > :is(Control)">
     <Style.Animations>