diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index 750a5ea3f..c38e95cea 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -36,6 +36,8 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.text.TextUtils;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import com.android.email.R;
@@ -472,6 +474,12 @@ public class AccountSetupFinal extends AccountSetupActivity
             ft.addToBackStack(backstackTag);
         }
         ft.commit();
+
+        final InputMethodManager imm =
+                (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+        final View fragment_container = findViewById(R.id.setup_fragment_container);
+        imm.hideSoftInputFromWindow(fragment_container.getWindowToken(),
+                0 /* flags: always hide */);
     }
 
     /**