diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 5f00c1eafe..f51338565e 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -113,7 +113,8 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            IsOpen = _popup.IsOpen = false;
+            IsOpen = false;
+            _popup.IsOpen = false;
 
             // Ensure this isn't active
             transientDisposable?.Dispose();
@@ -267,7 +268,6 @@ namespace Avalonia.Controls.Primitives
         private void OnPopupOpened(object sender, EventArgs e)
         {
             IsOpen = true;
-            OnOpened();
         }
 
         private void OnPopupClosed(object sender, EventArgs e)
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3082ffaf15..f2dadb3248 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -492,12 +492,8 @@ namespace Avalonia.Controls
         {
             base.OnLostFocus(e);
 
-            if ((ContextFlyout == null) && (ContextMenu == null || !ContextMenu.IsOpen))
-            {
-                ClearSelection();
-                RevealPassword = false;
-            }
-            if (ContextFlyout == null || !ContextFlyout.IsOpen)
+            if ((ContextFlyout == null || !ContextFlyout.IsOpen) &&
+                (ContextMenu == null || !ContextMenu.IsOpen))
             {
                 ClearSelection();
                 RevealPassword = false;