From 3526438f5889f20d364a619bd097fabbc671d5ed Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Sat, 13 Sep 2025 09:10:41 +0200
Subject: [PATCH] Update MenuButton.cs

---
 MapUiTools/Shared/MenuButton.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/MapUiTools/Shared/MenuButton.cs b/MapUiTools/Shared/MenuButton.cs
index 596379cd..05d0f096 100644
--- a/MapUiTools/Shared/MenuButton.cs
+++ b/MapUiTools/Shared/MenuButton.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 #if WPF
 using System.Windows;
 using System.Windows.Controls;
@@ -33,9 +34,13 @@ namespace MapControl.UiTools
             {
                 DataContext = Map;
 
-                if (Items.Count > 0 && Items[0] is MapMenuItem item)
+                var initialItem =
+                    Items.OfType<MapMenuItem>().FirstOrDefault(item => item.IsChecked) ??
+                    Items.OfType<MapMenuItem>().FirstOrDefault();
+
+                if (initialItem != null)
                 {
-                    await item.Execute(Map);
+                    await initialItem.Execute(Map);
                 }
             }
         }