diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index b4e4dd5071..9bb4cc4816 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -280,9 +280,8 @@ namespace Avalonia.Controls
             }
 
             _popup.Child = this;
-            _popup.IsOpen = true;
-
             IsOpen = true;
+            _popup.IsOpen = true;
 
             RaiseEvent(new RoutedEventArgs
             {
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 7e28d88581..4e742b3b7b 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -410,10 +410,15 @@ namespace Avalonia.Controls
         protected override void OnLostFocus(RoutedEventArgs e)
         {
             base.OnLostFocus(e);
-            SelectionStart = 0;
-            SelectionEnd = 0;
+
+            if (ContextMenu == null || !ContextMenu.IsOpen)
+            {
+                SelectionStart = 0;
+                SelectionEnd = 0;
+                RevealPassword = false;
+            }
+            
             _presenter?.HideCaret();
-            RevealPassword = false;
         }
 
         protected override void OnTextInput(TextInputEventArgs e)