diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
index 75bbbf9ab5..f5103268ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -58,6 +58,7 @@ public class SearchToolbar extends LinearLayout {
     EditText   searchText = searchView.findViewById(R.id.search_src_text);
 
     searchView.setSubmitButtonEnabled(false);
+    searchView.setMaxWidth(Integer.MAX_VALUE);
 
     if (searchText != null) searchText.setHint(R.string.SearchToolbar_search);
     else                    searchView.setQueryHint(getResources().getString(R.string.SearchToolbar_search));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index f7ba5720e3..5ee0703671 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -1098,6 +1098,8 @@ public class ConversationParentFragment extends Fragment
       }
     });
 
+    searchView.setMaxWidth(Integer.MAX_VALUE);
+
     if (isSearchRequested) {
       if (searchViewItem.expandActionView()) {
           searchViewModel.onSearchOpened();