diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
index 1a5d7504..90904e52 100644
--- a/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
+++ b/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java
@@ -62,6 +62,9 @@ public class DeviceActivity extends ActionBarActivity {
                                 if (errorHeader == null) {
                                     errorHeader = new TextView(DeviceActivity.this);
                                     errorHeader.setPadding(0,24,0,0);
+                                    errorHeader.setOnClickListener(null);
+                                    errorHeader.setOnLongClickListener(null);
+
                                     errorHeader.setText(getResources().getString(R.string.plugins_failed_to_load));
                                 }
                                 errorList.addHeaderView(errorHeader);
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
index 0c3256ad..6dc97a83 100644
--- a/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+++ b/src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java
@@ -23,7 +23,6 @@ public class SectionItem implements ListAdapter.Item {
 
         v.setOnClickListener(null);
         v.setOnLongClickListener(null);
-        v.setLongClickable(false);
 
         TextView sectionView = (TextView) v.findViewById(R.id.list_item_category_text);
         sectionView.setText(title);
diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
index bb76c36e..4a5a6b13 100644
--- a/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -133,7 +133,7 @@ public class MainActivity extends ActionBarActivity {
                     }
                 }
                 if (section.isEmpty) {
-                    items.remove(items.size()-1); //Remove section
+                    items.remove(items.size()-1); //Remove remembered devices section if empty
                 }
 
                 runOnUiThread(new Runnable() {