diff --git a/src/App/Pages/Settings/FoldersPageViewModel.cs b/src/App/Pages/Settings/FoldersPageViewModel.cs
index 8c2019ae6..48097988d 100644
--- a/src/App/Pages/Settings/FoldersPageViewModel.cs
+++ b/src/App/Pages/Settings/FoldersPageViewModel.cs
@@ -23,7 +23,7 @@ namespace Bit.App.Pages
             PageTitle = AppResources.Folders;
             Folders = new ExtendedObservableCollection<FolderView>();
         }
-        
+
         public ExtendedObservableCollection<FolderView> Folders { get; set; }
 
         public bool ShowNoData
@@ -38,7 +38,7 @@ namespace Bit.App.Pages
             // Remove "No Folder"
             if(folders?.Any() ?? false)
             {
-                folders.Remove(folders.Last());
+                folders = folders.GetRange(0, folders.Count - 1);
             }
             Folders.ResetWithRange(folders ?? new List<FolderView>());
             ShowNoData = Folders.Count == 0;