diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/tabs/TabLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/tabs/TabLayout.java
index 1528f0ea4..0912b60c5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/tabs/TabLayout.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/tabs/TabLayout.java
@@ -1715,7 +1715,9 @@ public class TabLayout extends HorizontalScrollView implements CustomViewHelper{
                 child.getLayoutParams().height);
 
         int childWidthMeasureSpec =
-            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY);
+            MeasureSpec.makeMeasureSpec(
+					getMeasuredWidth() - getPaddingLeft() - getPaddingRight(),
+					MeasureSpec.EXACTLY);
         child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
       }
     }
diff --git a/mastodon/src/main/res/layout/fragment_discover.xml b/mastodon/src/main/res/layout/fragment_discover.xml
index 4b4d8ae66..2b4d7c31c 100644
--- a/mastodon/src/main/res/layout/fragment_discover.xml
+++ b/mastodon/src/main/res/layout/fragment_discover.xml
@@ -45,6 +45,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:orientation="vertical">
+
 		<org.joinmastodon.android.ui.tabs.TabLayout
 			android:id="@+id/tabbar"
 			android:layout_width="match_parent"
@@ -56,6 +57,8 @@
 			app:tabIndicatorFullWidth="false"
 			app:tabMinWidth="90dp"
 			app:tabMode="scrollable"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
 			android:background="?colorM3Surface"/>
 
 		<View
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 4a4ffa6e5..86d37f3ee 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -384,11 +384,12 @@
 					android:layout_width="match_parent"
 					android:layout_height="48dp"
 					android:background="@drawable/bg_onboarding_panel"
+					android:clipToPadding="false"
+					android:paddingHorizontal="4dp"
 					app:tabGravity="start"
 					app:tabIndicator="@drawable/tab_indicator_m3"
 					app:tabIndicatorAnimationMode="elastic"
 					app:tabIndicatorColor="?colorM3Primary"
-					android:paddingHorizontal="4dp"
 					app:tabIndicatorFullWidth="false"
 					app:tabMinWidth="0dp"
 					app:tabMode="scrollable" />