diff --git a/.claude/worktrees/determined-wu-ac7e5c b/.claude/worktrees/determined-wu-ac7e5c
new file mode 160000
index 0000000..fb30e80
--- /dev/null
+++ b/.claude/worktrees/determined-wu-ac7e5c
@@ -0,0 +1 @@
+Subproject commit fb30e808634bf534798da66ebc11235ef0ba1cef
diff --git a/EmoTracker/UI/LayoutControl.axaml b/EmoTracker/UI/LayoutControl.axaml
index 667db6f..eaf175b 100644
--- a/EmoTracker/UI/LayoutControl.axaml
+++ b/EmoTracker/UI/LayoutControl.axaml
@@ -399,7 +399,7 @@
                     </Grid>
                     <!-- Content area -->
                     <Grid Grid.Row="1"
-                          Background="{Binding Background, Converter={x:Static converters:StringToBrushConverter.Instance}, TargetNullValue=#66212121, FallbackValue=#66212121}">
+                          Background="{Binding Background, Converter={x:Static converters:StringToBrushConverter.Instance}, TargetNullValue=#66212121, FallbackValue=#66212121}" ClipToBounds="True">
                         <!-- Use a single-cell Grid panel (not StackPanel) so children
                              receive the GroupBox content area's finite height constraint.
                              StackPanel measures children at infinite height in the stacking
diff --git a/EmoTracker/UI/PackageManagerWindow.axaml b/EmoTracker/UI/PackageManagerWindow.axaml
index b9c223a..4f7c644 100644
--- a/EmoTracker/UI/PackageManagerWindow.axaml
+++ b/EmoTracker/UI/PackageManagerWindow.axaml
@@ -132,7 +132,7 @@
         <!-- Package list -->
         <ScrollViewer Grid.Row="1" Grid.Column="1"
                       VerticalScrollBarVisibility="Auto"
-                      HorizontalScrollBarVisibility="Disabled">
+                      HorizontalScrollBarVisibility="Disabled" ClipToBounds="True">
             <Grid TextElement.Foreground="WhiteSmoke" Grid.IsSharedSizeScope="True" MinHeight="50">
 
                 <!-- Empty state message -->