diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 51a2bb145..613b80b37 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -149,7 +149,11 @@ public Brush CaretBrush
 
 #endif
 
-    public PasswordBox() => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
+    public PasswordBox()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Focus, (s, e) => Focus()));
+    }
 
     public System.Windows.Controls.PasswordBox ActualPasswordBox { get; set; }
 
@@ -270,6 +274,12 @@ public void Clear()
         _textBox.Clear();
     }
 
+    public new void Focus()
+    {
+        ActualPasswordBox.Focus();
+        _textBox.Focus();
+    }
+
     private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
     {
         if (!IsSafeEnabled)
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
index 015d63dca..6c9ecb52f 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
@@ -188,4 +188,6 @@ public static class ControlCommands
     public static RoutedCommand More { get; } = new(nameof(More), typeof(ControlCommands));
 
     public static RoutedCommand Toggle { get; } = new(nameof(Toggle), typeof(ControlCommands));
+
+    public static RoutedCommand Focus { get; } = new(nameof(Focus), typeof(ControlCommands));
 }