diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.kt
index 51f15b23cf..f46dc55eea 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.kt
@@ -69,10 +69,26 @@ class BookmarkFragment : CommonsDaggerSupportFragment() {
      */
     fun setupTabLayout() {
         binding!!.tabLayout.visibility = View.VISIBLE
+        context?.resources?.configuration?.orientation?.let { orientation ->
+            updateTabMode(orientation)
+        }
         if (adapter!!.count == 1) {
             binding!!.tabLayout.visibility = View.GONE
         }
     }
+    override fun onConfigurationChanged(newConfig: android.content.res.Configuration) {
+        super.onConfigurationChanged(newConfig)
+        updateTabMode(newConfig.orientation)
+    }
+    private fun updateTabMode(orientation: Int) {
+        if (orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE) {
+            binding?.tabLayout?.tabMode = com.google.android.material.tabs.TabLayout.MODE_FIXED
+            binding?.tabLayout?.tabGravity = com.google.android.material.tabs.TabLayout.GRAVITY_FILL
+        } else {
+            binding?.tabLayout?.tabMode = com.google.android.material.tabs.TabLayout.MODE_SCROLLABLE
+            binding?.tabLayout?.tabGravity = com.google.android.material.tabs.TabLayout.GRAVITY_FILL
+        }
+    }
 
 
     fun onBackPressed() {