diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
index b54fdecaa..5f1cb7854 100644
--- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
@@ -119,7 +119,9 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc
 		searchField.addTextChangedListener(this);
 		searchField.setHint(R.string.search_messages);
 		searchField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
-		showKeyboard(searchField);
+		if (term == null) {
+			showKeyboard(searchField);
+		}
 		return super.onCreateOptionsMenu(menu);
 	}