diff --git a/res/layout/nav_header.xml b/res/layout/nav_header.xml
index 55f8d72d..515491b8 100644
--- a/res/layout/nav_header.xml
+++ b/res/layout/nav_header.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingStart="@dimen/nav_header_horizontal_margin"
-    android:paddingEnd="@dimen/nav_header_horizontal_margin"
-    android:paddingRight="@dimen/nav_header_horizontal_margin">
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true">
 
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
+        android:paddingStart="@dimen/nav_header_horizontal_margin"
+        android:paddingLeft="@dimen/nav_header_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingEnd="@dimen/nav_header_horizontal_margin"
+        android:paddingRight="@dimen/nav_header_horizontal_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin">
 
         <ImageView
             android:id="@+id/device_type"
@@ -27,10 +26,10 @@
             tools:srcCompat="@drawable/ic_device_phone_32dp" />
 
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="center_vertical"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent">
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/kdeconnect_label"
@@ -48,4 +47,4 @@
                 tools:text="My device" />
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>