diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
index 9a04dc42ec..3ada954fa0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
@@ -250,8 +250,11 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
         maxWidth = Math.max(maxWidth, tabWidth);
       }
 
-      int viewWidth = right - left;
-      if (totalWidth < viewWidth) {
+      int viewWidth    = right - left;
+      int tabCount     = tabLayout.getTabCount();
+      int fixedTabSize = tabCount > 0 ? viewWidth / tabCount : 0;
+
+      if (totalWidth < viewWidth && maxWidth <= fixedTabSize) {
         tabLayout.setTabMode(TabLayout.MODE_FIXED);
       }
     });
diff --git a/app/src/main/res/layout/bold_selection_tab_item.xml b/app/src/main/res/layout/bold_selection_tab_item.xml
index c6291096b0..80bf617207 100644
--- a/app/src/main/res/layout/bold_selection_tab_item.xml
+++ b/app/src/main/res/layout/bold_selection_tab_item.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:alpha="1"
         android:gravity="center"
-        android:maxLines="2"
+        android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="@color/signal_text_secondary"
         tools:text="Media" />
@@ -23,7 +23,7 @@
         android:alpha="0"
         android:fontFamily="sans-serif-medium"
         android:gravity="center"
-        android:maxLines="2"
+        android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="@color/signal_text_primary"
         tools:text="Media" />