diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 0c4ff4a7a..8ede947c5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -11,6 +11,8 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -113,6 +115,9 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
         final TextView txtvError = (TextView) view.findViewById(R.id.txtvError);
         final ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progBarLogin);
 
+        password.setOnEditorActionListener((v, actionID, event) ->
+            actionID == EditorInfo.IME_ACTION_GO && login.performClick());
+
         login.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -131,6 +136,11 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
                         login.setEnabled(false);
                         progressBar.setVisibility(View.VISIBLE);
                         txtvError.setVisibility(View.GONE);
+                        // hide the keyboard
+                        InputMethodManager inputManager = (InputMethodManager)
+                                getSystemService(Context.INPUT_METHOD_SERVICE);
+                        inputManager.hideSoftInputFromWindow(login.getWindowToken(),
+                                InputMethodManager.HIDE_NOT_ALWAYS);
 
                     }
 
diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml
index 13c5977f8..a290b682b 100644
--- a/app/src/main/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
@@ -33,7 +33,11 @@
         android:layout_margin="8dp"
         android:focusable="true"
         android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
+        android:cursorVisible="true"
+        android:maxLines="1"
+        android:inputType="text"
+        android:imeOptions="actionNext"
+        android:nextFocusForward="@id/etxtPassword"/>
 
     <EditText
         android:id="@+id/etxtPassword"
@@ -45,7 +49,9 @@
         android:layout_margin="8dp"
         android:focusable="true"
         android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
+        android:cursorVisible="true"
+        android:imeOptions="actionGo"
+        android:imeActionLabel="@string/gpodnetauth_login_butLabel"/>
 
     <Button
         android:id="@+id/butLogin"