diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
index 8da611bd..0b74349d 100644
--- a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
+++ b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
@@ -52,7 +52,7 @@
                                       OnClearButtonClick="@OnClearButtonClick"
                                       Pattern="@Pattern"
                                       DisablePaste="@DisablePaste"
-                                      ShrinkLabel="@ShrinkLabel"
+                                      ShrinkLabel="@(AdornmentStart != null || ShrinkLabel)"
                                       HasAdornmentStart="@(AdornmentStart != null)">
                         <AdornmentStart>
                             @AdornmentStart