From c375e7c0363b83b596f57d06d7b6ea8b9c4d80cb Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Fri, 14 Aug 2026 15:35:44 +0200
Subject: [PATCH 1/2] test(popupbox): verify popup closes when toggle button is
 clicked

---
 .../WPF/PopupBoxes/PopupBoxTests.cs           | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
index d66152e4cd..daeee9a379 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
@@ -51,4 +51,33 @@ await Wait.For(async () =>
             await Assert.That(await border.GetBackgroundColor()).IsEqualTo(Colors.Red);
         });
     }
+
+    [Test]
+    [Description("https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/issues/2280")]
+    public async Task PopupBox_WhenInOpenedState_ClosesWhenClicked()
+    {
+        //Arrange
+        IVisualElement<PopupBox> popupBox = await LoadXaml<PopupBox>("""
+            <materialDesign:PopupBox Style="{StaticResource MaterialDesignMultiFloatingActionPopupBox}" IsPopupOpen="True">
+                <StackPanel>
+                    <Button Content="1" />
+                    <Button Content="2" />
+                    <Button Content="3" />
+                </StackPanel>
+            </materialDesign:PopupBox>
+            """);
+        bool isOpen = await popupBox.GetIsPopupOpen();
+        await Assert.That(isOpen).IsTrue();
+
+        //Act
+        IVisualElement<ToggleButton> toggleButton = await popupBox.GetElement<ToggleButton>("/ToggleButton");
+        await toggleButton.LeftClick();
+
+        //Assert
+        await Wait.For(async () =>
+        {
+            isOpen = await popupBox.GetIsPopupOpen();
+            await Assert.That(isOpen).IsFalse();
+        });
+    }
 }

From 8541a9b1197d90f268211c51be95283228439137 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Fri, 14 Aug 2026 15:36:12 +0200
Subject: [PATCH 2/2] fix(popupbox): close popup when toggle button is clicked
 while open

---
 src/MaterialDesignThemes.Wpf/PopupBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MaterialDesignThemes.Wpf/PopupBox.cs b/src/MaterialDesignThemes.Wpf/PopupBox.cs
index 62df1e2fb9..710e3e7482 100644
--- a/src/MaterialDesignThemes.Wpf/PopupBox.cs
+++ b/src/MaterialDesignThemes.Wpf/PopupBox.cs
@@ -833,7 +833,7 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
 
     private void ToggleButtonOnPreviewMouseLeftButtonUp(object? sender, MouseButtonEventArgs mouseButtonEventArgs)
     {
-        if (PopupMode == PopupBoxPopupMode.Click || !IsPopupOpen) return;
+        if (!IsPopupOpen) return;
 
         if (ToggleCheckedContent != null)
         {