diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index 7321f6a53e..bd36ed1cef 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -55,6 +55,7 @@ import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.Window;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.owncloud.android.R;
@@ -485,7 +486,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         if (v.getId() == R.id.refreshButton) {
             onFocusChange(findViewById(R.id.host_URL), false);
         } else if (v.getId() == R.id.viewPassword) {
-            TextView view = (TextView) findViewById(R.id.account_password);
+            EditText view = (EditText) findViewById(R.id.account_password);
+            int selectionStart = view.getSelectionStart();
+            int selectionEnd = view.getSelectionEnd();
             int input_type = view.getInputType();
             if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {
                 input_type = InputType.TYPE_CLASS_TEXT
@@ -495,6 +498,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                         | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
             }
             view.setInputType(input_type);
+            view.setSelection(selectionStart, selectionEnd);
         }
     }