diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index f78482525..083a26041 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -353,6 +353,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 
 			@Override
 			public void run() {
+				hideKeyboard();
 				final Intent intent;
 				final XmppConnection connection = mAccount.getXmppConnection();
 				final boolean wasFirstAccount = xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1;