diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index bcc2b4967..afda8e867 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -304,7 +304,7 @@ export class FolderModel extends AbstractModel {
 					return null;
 				},
 
-				canBeDeleted: () => !folder.isSystemFolder() && !folder.subFolders().length,
+				canBeDeleted: () => !folder.isSystemFolder() && folder.selectable,
 
 				canBeSubscribed: () => !folder.isSystemFolder()
 					&& SettingsUserStore.hideUnsubscribed()
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 54f7689b5..6404f4007 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -98,7 +98,7 @@ export class FoldersUserSettings {
 					if (folderToRemove === folder) {
 						return true;
 					}
-					folder.subFolders.remove(fRemoveFolder);
+					//folder.subFolders.remove(fRemoveFolder);
 					return false;
 				};