From f94e4eb9e75d69f3b12b436f2d036331f4d4a0d9 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 29 Jun 2021 16:54:29 +0200
Subject: [PATCH 1/2] fixes(ComboBox): Closing window on Alt+F4 KeyDown when
 ComboBox is focused

---
 src/Avalonia.Controls/ComboBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index f8728af87f..dd2109e6cd 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -205,7 +205,7 @@ namespace Avalonia.Controls
             if (e.Handled)
                 return;
 
-            if (e.Key == Key.F4 ||
+            if ((e.Key == Key.F4 && e.KeyModifiers.HasAllFlags(KeyModifiers.Alt) == false) ||
                 ((e.Key == Key.Down || e.Key == Key.Up) && e.KeyModifiers.HasAllFlags(KeyModifiers.Alt)))
             {
                 IsDropDownOpen = !IsDropDownOpen;

From 83c141172f17de098907b7b207f4300f35e8ba73 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 29 Jun 2021 16:55:09 +0200
Subject: [PATCH 2/2] feat(tests): Add test to check closing window on Alt+F4
 KeyDown when ComboBox is focused

---
 .../ComboBoxTests.cs                          | 61 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index 8f9c7fdb0b..cb2fd11175 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -201,6 +201,65 @@ namespace Avalonia.Controls.UnitTests
                 
             }
             
-        } 
+        }
+
+        [Fact]
+        public void Close_Window_On_Alt_F4_When_ComboBox_Is_Focus()
+        {
+            var inputManagerMock = new Moq.Mock<IInputManager>();
+            var services = TestServices.StyledWindow.With(inputManager: inputManagerMock.Object);
+
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+
+                window.KeyDown += (s, e) =>
+                 {
+                     if (e.Handled == false 
+                     && e.KeyModifiers.HasAllFlags(KeyModifiers.Alt) == true 
+                     && e.Key == Key.F4 )
+                     {
+                         e.Handled = true;
+                         window.Close();
+                     }
+                 };
+
+                var count = 0;
+
+                var target = new ComboBox
+                {
+                    Items = new[] { new Canvas() },
+                    SelectedIndex = 0,
+                    Template = GetTemplate(),
+                };
+
+                window.Content = target;
+
+
+                window.Closing +=
+                    (sender, e) =>
+                    {
+                        count++;
+                    };
+
+                window.Show();
+
+                target.Focus();
+
+                _helper.Down(target);
+                _helper.Up(target);
+                Assert.True(target.IsDropDownOpen);
+
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    KeyModifiers = KeyModifiers.Alt,
+                    Key = Key.F4
+                });
+
+
+                Assert.Equal(1, count);
+            }
+        }
     }
 }