From 0e82bce249b255f83cacad837d161a2866d2ef7f Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Sun, 21 Mar 2021 19:42:04 -0500
Subject: [PATCH] Button closes Flyout on escape key press

---
 src/Avalonia.Controls/Button.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 4fe385a782..a7ebced0ca 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -271,6 +271,11 @@ namespace Avalonia.Controls
                 IsPressed = true;
                 e.Handled = true;
             }
+            else if (e.Key == Key.Escape && Flyout != null)
+            {
+                // If Flyout doesn't have focusable content, close the flyout here
+                Flyout.Hide();
+            }
 
             base.OnKeyDown(e);
         }