diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
index ed76d432b5..5b2ffbcba2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
@@ -52,6 +52,8 @@ public class GiphyActivity extends PassphraseRequiredActivity implements Keyboar
     getSupportFragmentManager().beginTransaction()
                                .replace(R.id.fragment_container, fragment)
                                .commit();
+
+    ViewUtil.focusAndShowKeyboard(findViewById(R.id.emoji_search_entry));
   }
 
   private void initializeToolbar() {