diff --git a/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml b/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
index e9c69cc..a2aef9d 100644
--- a/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
@@ -88,8 +88,8 @@
       </Grid>
     </Border>
 
-    <!-- ── Main body: agent strip (auto) · terminal (flex) · steps+notes (auto/capped) ── -->
-    <Grid RowDefinitions="Auto,*,Auto">
+    <!-- ── Main body: agent strip (auto) · terminal (flex) · steps+notes (auto/capped) · agent overrides (auto) ── -->
+    <Grid RowDefinitions="Auto,*,Auto,Auto">
 
       <!-- Agent strip -->
       <islands:AgentStripView Grid.Row="0"/>
@@ -150,49 +150,50 @@
                      LostFocus="NotesLostFocus"/>
           </StackPanel>
 
-          <!-- Agent settings overrides -->
-          <Expander Header="Agent settings (overrides)"
-                    IsExpanded="False"
-                    IsEnabled="{Binding IsAgentSectionEnabled}"
-                    Margin="18,0,18,12">
-            <StackPanel Spacing="8" Margin="0,8,0,0">
-
-              <StackPanel Spacing="2">
-                <TextBlock Text="Model" />
-                <ComboBox ItemsSource="{Binding TaskModelOptions}"
-                          SelectedItem="{Binding TaskModelSelection, Mode=TwoWay}"
-                          MinWidth="160" HorizontalAlignment="Left" />
-                <TextBlock Text="{Binding EffectiveModelHint, StringFormat='Effective if inherited: {0}'}"
-                           Opacity="0.6" FontSize="11" />
-              </StackPanel>
-
-              <StackPanel Spacing="2">
-                <TextBlock Text="System prompt (appended)" />
-                <TextBox Text="{Binding TaskSystemPrompt, Mode=TwoWay}"
-                         AcceptsReturn="True" TextWrapping="Wrap" MinHeight="60"
-                         Watermark="{Binding EffectiveSystemPromptHint}" />
-              </StackPanel>
-
-              <StackPanel Spacing="2">
-                <TextBlock Text="Agent file" />
-                <ComboBox ItemsSource="{Binding TaskAgentOptions}"
-                          SelectedItem="{Binding TaskSelectedAgent, Mode=TwoWay}"
-                          MinWidth="240" HorizontalAlignment="Left">
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Name}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </ComboBox>
-                <TextBlock Text="{Binding EffectiveAgentHint, StringFormat='Effective if inherited: {0}'}"
-                           Opacity="0.6" FontSize="11" />
-              </StackPanel>
-
-            </StackPanel>
-          </Expander>
-
         </StackPanel>
       </ScrollViewer>
+
+      <!-- Agent settings overrides — own row so expanding shrinks the terminal (down to its MinHeight) instead of scrolling inside the capped section -->
+      <Expander Grid.Row="3"
+                Header="Agent settings (overrides)"
+                IsExpanded="False"
+                IsEnabled="{Binding IsAgentSectionEnabled}"
+                Margin="18,0,18,12">
+        <StackPanel Spacing="8" Margin="0,8,0,0">
+
+          <StackPanel Spacing="2">
+            <TextBlock Text="Model" />
+            <ComboBox ItemsSource="{Binding TaskModelOptions}"
+                      SelectedItem="{Binding TaskModelSelection, Mode=TwoWay}"
+                      MinWidth="160" HorizontalAlignment="Left" />
+            <TextBlock Text="{Binding EffectiveModelHint, StringFormat='Effective if inherited: {0}'}"
+                       Opacity="0.6" FontSize="11" />
+          </StackPanel>
+
+          <StackPanel Spacing="2">
+            <TextBlock Text="System prompt (appended)" />
+            <TextBox Text="{Binding TaskSystemPrompt, Mode=TwoWay}"
+                     AcceptsReturn="True" TextWrapping="Wrap" MinHeight="60"
+                     PlaceholderText="{Binding EffectiveSystemPromptHint}" />
+          </StackPanel>
+
+          <StackPanel Spacing="2">
+            <TextBlock Text="Agent file" />
+            <ComboBox ItemsSource="{Binding TaskAgentOptions}"
+                      SelectedItem="{Binding TaskSelectedAgent, Mode=TwoWay}"
+                      MinWidth="240" HorizontalAlignment="Left">
+              <ComboBox.ItemTemplate>
+                <DataTemplate>
+                  <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+            <TextBlock Text="{Binding EffectiveAgentHint, StringFormat='Effective if inherited: {0}'}"
+                       Opacity="0.6" FontSize="11" />
+          </StackPanel>
+
+        </StackPanel>
+      </Expander>
     </Grid>
   </DockPanel>
 </UserControl>