diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index e9b804d..5274b5a 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -136,9 +136,7 @@
             <Button.Flyout>
                 <Flyout 
                         IsOpen="{Binding IsFunctionsPanelOpen, Mode=TwoWay}"
-                        Placement="BottomEdgeAlignedLeft"
-                        Opened="OnFunctionsFlyoutOpened"
-                        Closed="OnFunctionsFlyoutClosed">
+                        Placement="BottomEdgeAlignedLeft">
                     <Border x:Name="FunctionsPanelRoot" Padding="8" MinWidth="360" MaxHeight="420"
                             Background="{DynamicResource Brush.Surface}" BorderBrush="{DynamicResource Brush.Border}" BorderThickness="1" CornerRadius="6">
                         <ScrollViewer>
@@ -162,7 +160,7 @@
                                                         <DataTemplate x:DataType="m:FunctionDefinitionItem">
                                                             <Border Background="Transparent" Padding="8" MinHeight="36"
                                                                     AutomationProperties.Name="Insert function"
-																	Tapped="OnFunctionsItemTapped">
+                                                                    Tapped="OnFunctionsItemTapped">
                                                                 <Grid ColumnDefinitions="*,Auto">
                                                                     <StackPanel>
                                                                         <TextBlock Text="{Binding FunctionName}" FontWeight="Bold"/>
diff --git a/src/AdvancedCalculator/Views/MainView.axaml.cs b/src/AdvancedCalculator/Views/MainView.axaml.cs
index 5a3bbd9..bb86741 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml.cs
+++ b/src/AdvancedCalculator/Views/MainView.axaml.cs
@@ -21,7 +21,7 @@ public partial class MainView : UserControl
 
     private MainViewModel? _vm;
     private ListBox? _historyList;
-    private Border? _functionsPanelRoot;
+    // Functions flyout is handled via per-item Tapped in XAML
 
     private void OnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
     {
@@ -53,12 +53,6 @@ public partial class MainView : UserControl
             _historyList.RemoveHandler(InputElement.TappedEvent, OnHistoryTapped);
             _historyList = null;
         }
-        // Detach functions panel tap handler if still attached
-        if (_functionsPanelRoot is not null)
-        {
-            _functionsPanelRoot.RemoveHandler(InputElement.TappedEvent, OnFunctionsItemTapped);
-            _functionsPanelRoot = null;
-        }
         _vm = null;
     }
 
@@ -104,23 +98,5 @@ public partial class MainView : UserControl
         }
     }
 
-
-    private void OnFunctionsFlyoutOpened(object? sender, EventArgs e)
-{
-    if (sender is Flyout flyout && sender is ContentPresenter presenter)
-    {
-        _functionsPanelRoot = presenter.FindControl<Border>("FunctionsPanelRoot");
-        _functionsPanelRoot?.AddHandler(InputElement.TappedEvent, OnFunctionsItemTapped,
-            RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-    }
-}
-
-    private void OnFunctionsFlyoutClosed(object? sender, EventArgs e)
-    {
-        if (_functionsPanelRoot is not null)
-        {
-            _functionsPanelRoot.RemoveHandler(InputElement.TappedEvent, OnFunctionsItemTapped);
-            _functionsPanelRoot = null;
-        }
-    }
+    // Removed Opened/Closed dynamic wiring; handled directly in XAML.
 }