diff --git a/src/declarativeimports/plasmacomponents/qml/TextField.qml b/src/declarativeimports/plasmacomponents/qml/TextField.qml
--- a/src/declarativeimports/plasmacomponents/qml/TextField.qml
+++ b/src/declarativeimports/plasmacomponents/qml/TextField.qml
@@ -48,6 +48,7 @@
     // this takes into account kiosk restriction
     readonly property bool __effectiveRevealPasswordButtonShown: revealPasswordButtonShown
                                                               && KAuthorized.authorize("lineedit_reveal_password")
+                                                              && textField.text !== ""
 
     //Deprecated/unsupported api
     /**
@@ -105,7 +106,8 @@
             }
             MouseArea {
                 anchors.fill: parent
-                onPressedChanged: {
+                enabled: __effectiveRevealPasswordButtonShown
+                onClicked: {
                     textField.echoMode = (textField.echoMode == TextInput.Normal ? TextInput.Password : TextInput.Normal)
                     textField.forceActiveFocus()
                 }