diff --git a/app/src/main/res/layout/activity_sync_settings.xml b/app/src/main/res/layout/activity_sync_settings.xml
index 94861e1198..e9d183dc24 100644
--- a/app/src/main/res/layout/activity_sync_settings.xml
+++ b/app/src/main/res/layout/activity_sync_settings.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml b/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml
index 3b9298886a..747274220f 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml
@@ -26,7 +26,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsingToolbarLayout"
@@ -39,6 +40,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -80,11 +82,11 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/marginStandardSmall"
                         android:backgroundTint="@android:color/transparent"
+                        android:completionThreshold="1"
                         android:hint="@string/shareFileInputUserAndEmail"
                         android:imeOptions="actionDone"
                         android:inputType="textEmailAddress"
                         android:maxLines="1"
-                        android:completionThreshold="1"
                         android:textSize="16sp" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_select_drive.xml b/app/src/main/res/layout/fragment_bottom_sheet_select_drive.xml
index 7d53232d1d..671efbbe2a 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet_select_drive.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet_select_drive.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_select_media_folders.xml b/app/src/main/res/layout/fragment_bottom_sheet_select_media_folders.xml
index 4a3068c3b1..f5dde1ec28 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet_select_media_folders.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet_select_media_folders.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_create_folder.xml b/app/src/main/res/layout/fragment_create_folder.xml
index 93910f0a4c..47218e180d 100644
--- a/app/src/main/res/layout/fragment_create_folder.xml
+++ b/app/src/main/res/layout/fragment_create_folder.xml
@@ -24,7 +24,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="200dp">
+        android:layout_height="200dp"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/createFolderCollapsing"
@@ -46,6 +47,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/fragment_create_or_edit_category.xml b/app/src/main/res/layout/fragment_create_or_edit_category.xml
index 5a6ffead87..9013ff87a1 100644
--- a/app/src/main/res/layout/fragment_create_or_edit_category.xml
+++ b/app/src/main/res/layout/fragment_create_or_edit_category.xml
@@ -26,7 +26,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/appBarTitle"
@@ -39,6 +40,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/fragment_file_details.xml b/app/src/main/res/layout/fragment_file_details.xml
index dcb913a443..8a2586eaeb 100644
--- a/app/src/main/res/layout/fragment_file_details.xml
+++ b/app/src/main/res/layout/fragment_file_details.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/fileDetailsCollapsingToolbar"
@@ -66,6 +67,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin"
                 app:navigationIconTint="@android:color/white" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/fragment_file_list.xml b/app/src/main/res/layout/fragment_file_list.xml
index 482578fef9..a27a8b10f1 100644
--- a/app/src/main/res/layout/fragment_file_list.xml
+++ b/app/src/main/res/layout/fragment_file_list.xml
@@ -27,7 +27,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsingToolbarLayout"
@@ -40,6 +41,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin"
                 app:menu="@menu/file_list_menu">
 
diff --git a/app/src/main/res/layout/fragment_file_share_details.xml b/app/src/main/res/layout/fragment_file_share_details.xml
index 1228ea589f..d6fbabde14 100644
--- a/app/src/main/res/layout/fragment_file_share_details.xml
+++ b/app/src/main/res/layout/fragment_file_share_details.xml
@@ -24,7 +24,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/fileShareCollapsingToolbarLayout"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -64,10 +66,10 @@
                     android:id="@+id/userAutoCompleteTextView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:completionThreshold="1"
                     android:imeOptions="actionDone"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
-                    android:completionThreshold="1"
                     android:textSize="16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_file_share_link_settings.xml b/app/src/main/res/layout/fragment_file_share_link_settings.xml
index 85ccfec7ca..87b240b787 100644
--- a/app/src/main/res/layout/fragment_file_share_link_settings.xml
+++ b/app/src/main/res/layout/fragment_file_share_link_settings.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -38,6 +39,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5fc2786d45..3077df731d 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -30,18 +30,21 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:touchscreenBlocksFocus="false">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 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
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
+                    android:touchscreenBlocksFocus="false"
                     app:layout_collapseMode="pin"
                     app:menu="@menu/file_list_menu"
                     app:navigationIcon="@null" />
diff --git a/app/src/main/res/layout/fragment_manage_dropbox.xml b/app/src/main/res/layout/fragment_manage_dropbox.xml
index 8a76a0b893..60346fe875 100644
--- a/app/src/main/res/layout/fragment_manage_dropbox.xml
+++ b/app/src/main/res/layout/fragment_manage_dropbox.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/fileShareCollapsingToolbarLayout"
@@ -38,6 +39,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_new_folder.xml b/app/src/main/res/layout/fragment_new_folder.xml
index fa3a5f9c56..f2319e7c4c 100644
--- a/app/src/main/res/layout/fragment_new_folder.xml
+++ b/app/src/main/res/layout/fragment_new_folder.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_root_files.xml b/app/src/main/res/layout/fragment_root_files.xml
index 5d80386801..2aec71a98c 100644
--- a/app/src/main/res/layout/fragment_root_files.xml
+++ b/app/src/main/res/layout/fragment_root_files.xml
@@ -32,7 +32,8 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/appBarHeight">
+            android:layout_height="@dimen/appBarHeight"
+            android:touchscreenBlocksFocus="false">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsingToolbarLayout"
@@ -45,6 +46,7 @@
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
+                    android:touchscreenBlocksFocus="false"
                     app:layout_collapseMode="pin"
                     app:menu="@menu/file_list_menu"
                     app:navigationIcon="@null" />
diff --git a/app/src/main/res/layout/fragment_search_filters.xml b/app/src/main/res/layout/fragment_search_filters.xml
index 6d35cf0b5f..efb4c7a0d0 100644
--- a/app/src/main/res/layout/fragment_search_filters.xml
+++ b/app/src/main/res/layout/fragment_search_filters.xml
@@ -26,7 +26,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/appBarTitle"
@@ -39,6 +40,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/fragment_select_categories.xml b/app/src/main/res/layout/fragment_select_categories.xml
index 36310556f6..cdfc4022c9 100644
--- a/app/src/main/res/layout/fragment_select_categories.xml
+++ b/app/src/main/res/layout/fragment_select_categories.xml
@@ -26,7 +26,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -38,6 +39,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin"
                 app:menu="@menu/add_category_menu" />
 
diff --git a/app/src/main/res/layout/fragment_select_permission.xml b/app/src/main/res/layout/fragment_select_permission.xml
index 7b2c7a7c3a..4a0bdb00d0 100644
--- a/app/src/main/res/layout/fragment_select_permission.xml
+++ b/app/src/main/res/layout/fragment_select_permission.xml
@@ -25,7 +25,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -37,6 +38,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index dfaa6d2138..795a3f22e0 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -24,7 +24,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -36,6 +37,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_settings_about.xml b/app/src/main/res/layout/fragment_settings_about.xml
index da91f58256..b23e7ac53c 100644
--- a/app/src/main/res/layout/fragment_settings_about.xml
+++ b/app/src/main/res/layout/fragment_settings_about.xml
@@ -24,7 +24,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appBarHeight">
+        android:layout_height="@dimen/appBarHeight"
+        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
@@ -36,6 +37,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/view_switch_settings.xml b/app/src/main/res/layout/view_switch_settings.xml
index d6e4476dc9..e3d4ad165f 100644
--- a/app/src/main/res/layout/view_switch_settings.xml
+++ b/app/src/main/res/layout/view_switch_settings.xml
@@ -34,6 +34,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
+            android:touchscreenBlocksFocus="false"
             android:layout_height="?attr/actionBarSize" />
 
         <ImageView