diff --git a/res/layout/nav_header.xml b/res/layout/nav_header.xml
index 318cd4ba..50053c5d 100644
--- a/res/layout/nav_header.xml
+++ b/res/layout/nav_header.xml
@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="160dp"
-    android:padding="16dp"
     android:background="@drawable/drawer_header"
     android:orientation="vertical"
     android:gravity="bottom">
@@ -14,8 +13,11 @@
         android:text="KDE Connect"
         android:textColor="#FFF"
         android:textStyle="bold"
-        android:paddingBottom="4dp"
         android:layout_above="@+id/device_name"
+        android:id="@+id/kdeconnect_label"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="48dp"
         />
 
     <TextView
@@ -23,12 +25,15 @@
         android:layout_height="wrap_content"
         android:text="My device"
         android:id="@+id/device_name"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="0dp"
         android:textColor="#fff"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        />
+        android:paddingBottom="16dp"
+        android:paddingTop="4dp"
+        android:paddingRight="48dp"
+        android:paddingLeft="16dp" />
 
     <!--
     <ImageView
diff --git a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
index 0d08d0c7..37e9bed6 100644
--- a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
@@ -66,12 +66,14 @@ public class MaterialActivity extends AppCompatActivity {
         TextView nameView = (TextView) mDrawerLayout.findViewById(R.id.device_name);
         nameView.setText(deviceName);
 
-        nameView.setOnClickListener(new View.OnClickListener() {
+        View.OnClickListener renameListener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 renameDevice();
             }
-        });
+        };
+        mDrawerLayout.findViewById(R.id.kdeconnect_label).setOnClickListener(renameListener);
+        mDrawerLayout.findViewById(R.id.device_name).setOnClickListener(renameListener);
 
         mNavigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
             @Override