diff --git a/dev/Remote/User/Fetch.js b/dev/Remote/User/Fetch.js
index 06d5e0a82..00360e9d1 100644
--- a/dev/Remote/User/Fetch.js
+++ b/dev/Remote/User/Fetch.js
@@ -207,15 +207,15 @@ class RemoteUserFetch extends AbstractFetchRemote {
 	 * @param {?Function} fCallback
 	 */
 	foldersReload(fCallback) {
-		clearTimeout(this.foldersTimeout);
+//		clearTimeout(this.foldersTimeout);
 		this.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
 				data = FolderCollectionModel.reviveFromJson(data.Result);
 				data && data.storeIt();
 				fCallback && fCallback(true);
-				// Repeat every 15 minutes
-				this.foldersTimeout = setTimeout(() => this.foldersReload(), 900000);
+				// Repeat every 15 minutes?
+//				this.foldersTimeout = setTimeout(() => this.foldersReload(), 900000);
 			})
 			.catch(() => fCallback && setTimeout(fCallback, 1, false));
 	}
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index f8a37c7c4..131662e16 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -79,8 +79,9 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
 					folder.name(nameToEdit/*data.Name*/);
 					if (folder.subFolders.length) {
 						Remote.setTrigger(FolderUserStore.foldersLoading, true);
-						clearTimeout(Remote.foldersTimeout);
-						Remote.foldersTimeout = setTimeout(() => Remote.foldersReload(), 500);
+//						clearTimeout(Remote.foldersTimeout);
+//						Remote.foldersTimeout = setTimeout(() => Remote.foldersReload(), 500);
+						setTimeout(() => Remote.foldersReload(), 500);
 						// TODO: rename all subfolders with folder.delimiter to prevent reload?
 					} else {
 						removeFolderFromCacheList(folder.fullName);