diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -73,11 +73,15 @@
     public DeviceFragment() {
     }
 
-    public DeviceFragment(String deviceId, boolean fromDeviceList) {
+    public static DeviceFragment newInstance(String deviceId, boolean fromDeviceList) {
+        DeviceFragment frag = new DeviceFragment();
+
         Bundle args = new Bundle();
         args.putString(ARG_DEVICE_ID, deviceId);
         args.putBoolean(ARG_FROM_DEVICE_LIST, fromDeviceList);
-        this.setArguments(args);
+        frag.setArguments(args);
+
+        return frag;
     }
 
     @Override
diff --git a/src/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
--- a/src/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -295,7 +295,7 @@
             } else {
                 mNavigationView.setCheckedItem(mCurrentMenuEntry);
             }
-            setContentFragment(new DeviceFragment(deviceId, fromDeviceList));
+            setContentFragment(DeviceFragment.newInstance(deviceId, fromDeviceList));
         } else {
             mCurrentMenuEntry = MENU_ENTRY_ADD_DEVICE;
             mNavigationView.setCheckedItem(mCurrentMenuEntry);