diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Preferences/CredentialsPreference.java b/app/src/main/java/org/shadowice/flocke/andotp/Preferences/CredentialsPreference.java
index 881f9695..6d4a621c 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Preferences/CredentialsPreference.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Preferences/CredentialsPreference.java
@@ -287,6 +287,12 @@ public class CredentialsPreference extends DialogPreference
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         value = entryValues.get(position);
         updateLayout();
+        clearInputFields();
+    }
+
+    private void clearInputFields() {
+        passwordInput.setText(null);
+        passwordConfirm.setText(null);
     }
 
     // Needed stub functions