diff --git a/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt b/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
index 5001c95d41..c3c9e87619 100644
--- a/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
+++ b/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
@@ -106,9 +106,10 @@ class PreviewHeaderView @JvmOverloads constructor(
         }
     }
 
-    fun setPageNumberVisibility(isVisible: Boolean) {
-        binding.pageNumberChip.isVisible = isVisible
-        binding.pageNumberChip.isFocusable = false
+    fun setPageNumberVisibility(isVisible: Boolean) = with(binding.pageNumberChip) {
+        this.isVisible = isVisible
+        // Set focusable to false to prevent unnecessary focus events during keyboard navigation.
+        isFocusable = false
     }
 
     fun setPageNumberValue(currentPage: Int, totalPage: Int) {
diff --git a/app/src/main/res/layout/fragment_file_list.xml b/app/src/main/res/layout/fragment_file_list.xml
index bd12f0689c..c850e342f8 100644
--- a/app/src/main/res/layout/fragment_file_list.xml
+++ b/app/src/main/res/layout/fragment_file_list.xml
@@ -277,8 +277,7 @@
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:fillViewport="true"
-                android:touchscreenBlocksFocus="true">
+                android:fillViewport="true">
 
                 <com.infomaniak.drive.views.NoItemsLayoutView
                     android:id="@+id/noFilesLayout"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3077df731d..2d6d7fd755 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -37,7 +37,6 @@
                 android:id="@+id/collapsingToolbarLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:touchscreenBlocksFocus="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_preview_slider.xml b/app/src/main/res/layout/fragment_preview_slider.xml
index c8f80a8a7d..563652d6d3 100644
--- a/app/src/main/res/layout/fragment_preview_slider.xml
+++ b/app/src/main/res/layout/fragment_preview_slider.xml
@@ -36,8 +36,6 @@
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
             android:touchscreenBlocksFocus="true"
             android:saveEnabled="false" />