diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
index 7b2555a7..5eebbdc1 100644
--- a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
+++ b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
@@ -58,7 +58,7 @@
                         }
                         else
                         {
-                            <MudIconButton Icon="@_passwordIcon" Color="@AdornmentColor" Size="@IconSize" OnClick="AdornmentClick"></MudIconButton>
+                            <MudIconButton Icon="@_passwordIcon" Color="@AdornmentColor" Size="@IconSize" OnClick="AdornmentClick" tabindex="@(AdornmentTabStop ? 0 : -1)"></MudIconButton>
                         }
                     </AdornmentEnd>
 
diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs
index 20cf2355..72eb77ba 100644
--- a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs
+++ b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs
@@ -39,6 +39,13 @@ public partial class MudPasswordField<T> : MudDebouncedInput<T>
         [Category(CategoryTypes.FormComponent.Behavior)]
         public bool Clearable { get; set; } = false;
 
+        /// <summary>
+        /// If true, adornment button accepts tab stop. Default is false.
+        /// </summary>
+        [Parameter]
+        [Category(CategoryTypes.FormComponent.Behavior)]
+        public bool AdornmentTabStop { get; set; }
+
         /// <summary>
         /// Button click event for clear button. Called after text and value has been cleared.
         /// </summary>