diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 10f86f27e1663..37ef15377b5c3 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -2884,6 +2884,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             setTransformationMethod(PasswordTransformationMethod.getInstance());
             setTypefaceByIndex(MONOSPACE, 0);
         } else if (isVisiblePassword) {
+            if (mTransformation == PasswordTransformationMethod.getInstance()) {
+                forceUpdate = true;
+            }
             setTypefaceByIndex(MONOSPACE, 0);
         } else if (wasPassword || wasVisiblePassword) {
             // not in password mode, clean up typeface and transformation