diff --git a/app/src/main/res/layout-v21/drawer_header.xml b/app/src/main/res/layout-v21/drawer_header.xml
index 9ed9f833a..7a7c6f155 100644
--- a/app/src/main/res/layout-v21/drawer_header.xml
+++ b/app/src/main/res/layout-v21/drawer_header.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="150dp"
-    android:clickable="true"
-    android:focusable="true">
+    android:layout_height="150dp">
 
     <Button
         android:id="@+id/drawer_header_action_button"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 83ed644ba..352f65c4c 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="wrap_content"
-android:layout_height="150dp"
-android:clickable="true"
-android:focusable="true">
+android:layout_height="150dp">
 
     <Button
         android:id="@+id/drawer_header_action_button"
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index ef446e9c6..3c48fbf94 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.navigation.NavigationView android:id="@+id/navigation_layout"
+<com.google.android.material.internal.ScrimInsetsFrameLayout android:id="@+id/navigation_layout"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="wrap_content"
     android:layout_gravity="start"
+    android:focusable="false"
+    android:background="?attr/android:windowBackground"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:clickable="true"
-    android:focusable="true"
     >
 
     <com.google.android.material.navigation.NavigationView
@@ -17,6 +17,7 @@
         app:elevation="0dp"
         android:background="?attr/android:windowBackground"
         app:headerLayout="@layout/drawer_header"
+        android:focusable="false"
         android:theme="@style/NavViewTextStyle"/>
         <!-- app:menu="@menu/drawer_items" -->
 
@@ -33,4 +34,4 @@
         android:layout_alignParentBottom="true">
     </LinearLayout>
 
-</com.google.android.material.navigation.NavigationView>
\ No newline at end of file
+</com.google.android.material.internal.ScrimInsetsFrameLayout>
\ No newline at end of file