diff --git a/src/Boot/Windows/BootMain.cpp b/src/Boot/Windows/BootMain.cpp
index f66fd36b..2cfc2945 100644
--- a/src/Boot/Windows/BootMain.cpp
+++ b/src/Boot/Windows/BootMain.cpp
@@ -173,8 +173,11 @@ static byte AskPassword (Password &password, int& pim)
 			{
 				while (pos < MAX_PASSWORD)
 				{
-					PrintChar ('*');
 					pos++;
+					if (pos < MAX_PASSWORD)
+						PrintChar ('*');
+					else
+						PrintCharAtCursor ('*');
 				}
 			}