diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index 3ea7f4b..21f52f6 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -85,7 +85,7 @@
                                     </StackPanel>
 
                                     <!-- Hover-only copy button for Desktop/Web with options flyout -->
-                                    <Button Grid.Column="2"
+                                    <Button Grid.Column="2" Panel.ZIndex="1"
                                             IsVisible="{Binding #HistoryRow.IsPointerOver}"
                                             Margin="8,0,0,0"
                                             Padding="8,4"
@@ -127,7 +127,7 @@
 
                                     <!-- Full-row overlay click target (pure XAML/MVVM).
                                          Sits on top of icon + text (columns 0-1) and triggers copy of output. -->
-                                    <Button Grid.ColumnSpan="2"
+                                    <Button Grid.ColumnSpan="3" Panel.ZIndex="0"
                                             Background="Transparent"
                                             BorderThickness="0"
                                             Focusable="False"