diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
index ffff1c30..2a4a0e6d 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
@@ -264,8 +264,8 @@ public class FolderFragment extends Fragment
         if (devicesList.isEmpty()) {
             addEmptyDeviceListView();
         } else {
+            mDevicesContainer.removeAllViews();
             for (RestApi.Device n : devicesList) {
-                mDevicesContainer.removeAllViews();
                 addDeviceViewAndSetListener(n, LayoutInflater.from(getActivity()));
             }
         }