diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b1ee465..224885ae7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Reduce Autofill false positives on username fields by removing "name" from list of heuristic terms
 - Reduced app size
+- Improve IME experience with server config screen
 
 ## [1.8.1] - 2020-05-24
 
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index cab9dc7b0..6fe19f197 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -10,6 +10,7 @@
     android:layout_height="match_parent"
     android:background="?android:attr/windowBackground"
     android:padding="@dimen/activity_horizontal_margin"
+    tools:background="@color/white"
     tools:context="com.zeapo.pwdstore.git.GitOperationActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -76,7 +77,12 @@
                 android:id="@+id/server_user"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textWebEmailAddress" />
+                android:imeOptions="actionNext"
+                android:inputType="textWebEmailAddress"
+                android:nextFocusForward="@id/server_url">
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputEditText>
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -93,7 +99,9 @@
                 android:id="@+id/server_url"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textWebEmailAddress" />
+                android:imeOptions="actionNext"
+                android:inputType="textWebEmailAddress"
+                android:nextFocusForward="@id/server_port" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -112,7 +120,9 @@
                 android:id="@+id/server_port"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="number" />
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:nextFocusForward="@id/server_path" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -129,6 +139,7 @@
                 android:id="@+id/server_path"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
                 android:inputType="textWebEmailAddress" />
 
         </com.google.android.material.textfield.TextInputLayout>