diff --git a/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java b/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java
index ed2ebdfa9..615a3bf9d 100644
--- a/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java
+++ b/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java
@@ -179,7 +179,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case android.R.id.home:
-				if (textInput.isKeyboardOpen()) textInput.hideSoftKeyboard();
 				supportFinishAfterTransition();
 				return true;
 			default:
diff --git a/briar-android/src/org/briarproject/android/view/TextInputView.java b/briar-android/src/org/briarproject/android/view/TextInputView.java
index ff75c84bf..5eda03167 100644
--- a/briar-android/src/org/briarproject/android/view/TextInputView.java
+++ b/briar-android/src/org/briarproject/android/view/TextInputView.java
@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import static android.content.Context.INPUT_METHOD_SERVICE;
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static android.view.KeyEvent.KEYCODE_BACK;
-import static android.view.inputmethod.InputMethodManager.SHOW_FORCED;
+import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 
 @UiThread
 public class TextInputView extends KeyboardAwareLinearLayout
@@ -180,7 +180,7 @@ public class TextInputView extends KeyboardAwareLinearLayout
 				InputMethodManager imm =
 						(InputMethodManager) getContext()
 								.getSystemService(INPUT_METHOD_SERVICE);
-				imm.showSoftInput(ui.editText, SHOW_FORCED);
+				imm.showSoftInput(ui.editText, SHOW_IMPLICIT);
 			}
 		});
 	}