From 7f7db22004fd45f136bf7307c93ce2d52f0542d3 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Tue, 6 Oct 2020 22:23:03 -0500
Subject: [PATCH] Only move focus if Popup had it

---
 src/Avalonia.Controls/Primitives/Popup.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 5d911d7727..becb489557 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -587,16 +587,23 @@ namespace Avalonia.Controls.Primitives
 
             Closed?.Invoke(this, EventArgs.Empty);
 
-            if (PlacementTarget != null)
-            {
-                FocusManager.Instance?.Focus(PlacementTarget);
-            }
-            else
+            var focusCheck = FocusManager.Instance?.Current;
+
+            // Focus is set to null as part of popup closing, so we only want to
+            // set focus to PlacementTarget if this is the case
+            if (focusCheck == null)
             {
-                var anc = this.FindLogicalAncestorOfType<IControl>();
-                if (anc != null)
+                if (PlacementTarget != null)
                 {
-                    FocusManager.Instance?.Focus(anc);
+                    FocusManager.Instance?.Focus(PlacementTarget);
+                }
+                else
+                {
+                    var anc = this.FindLogicalAncestorOfType<IControl>();
+                    if (anc != null)
+                    {
+                        FocusManager.Instance?.Focus(anc);
+                    }
                 }
             }
         }