diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 94290895eb..553ca03636 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -404,7 +404,7 @@ $(document).ready(function() {
 				
 				$('#uploadprogresswrapper input.stop').fadeOut();
 				$('#uploadprogressbar').fadeOut();
-				
+			    Files.updateStorageStatistics();
 			});
 			fileupload.on('fileuploadfail', function(e, data) {
 				OC.Upload.log('progress handle fileuploadfail', e, data);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3ef3c2c176..66b4a006f8 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -554,6 +554,7 @@ var FileList={
 						checkTrashStatus();
 						FileList.updateFileSummary();
 						FileList.updateEmptyContent();
+						Files.updateStorageStatistics();
 					} else {
 						$.each(files,function(index,file) {
 							var deleteAction = $('tr[data-file="'+files[i]+'"]').children("td.date").children(".action.delete");
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index eb30ddfda0..a7aea0957b 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -1,4 +1,28 @@
 Files={
+	// file space size sync
+	_updateStorageStatistics: function() {
+		Files._updateStorageStatisticsTimeout = null;
+		if (Files.updateStorageStatistics.running){
+			return;
+		}
+		Files.updateStorageStatistics.running = true;
+		$.getJSON(OC.filePath('files','ajax','getstoragestats.php'),function(response) {
+			Files.updateStorageStatistics.running = false;
+			Files.updateMaxUploadFilesize(response);
+		});
+	},
+	updateStorageStatistics: function() {
+		if (!OC.currentUser) {
+			return;
+		}
+
+		// debounce to prevent calling too often
+		if (Files._updateStorageStatisticsTimeout) {
+			clearTimeout(Files._updateStorageStatisticsTimeout);
+		}
+		Files._updateStorageStatisticsTimeout = setTimeout(Files._updateStorageStatistics, 1000);
+	},
+
 	updateMaxUploadFilesize:function(response) {
 		if (response === undefined) {
 			return;
@@ -351,29 +375,23 @@ $(document).ready(function() {
 	setTimeout ( "Files.displayStorageWarnings()", 100 );
 	OC.Notification.setDefault(Files.displayStorageWarnings);
 
-	// file space size sync
-	function update_storage_statistics() {
-		$.getJSON(OC.filePath('files','ajax','getstoragestats.php'),function(response) {
-			Files.updateMaxUploadFilesize(response);
-		});
-	}
 	// only possible at the moment if user is logged in
 	if (OC.currentUser) {
 		// start on load - we ask the server every 5 minutes
-		var update_storage_statistics_interval = 5*60*1000;
-		var update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+		var updateStorageStatisticsInterval = 5*60*1000;
+		var updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
 
 		// Use jquery-visibility to de-/re-activate file stats sync
 		if ($.support.pageVisibility) {
 			$(document).on({
 				'show.visibility': function() {
-					if (!update_storage_statistics_interval_id) {
-						update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+					if (!updateStorageStatisticsIntervalId) {
+						updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
 					}
 				},
 				'hide.visibility': function() {
-					clearInterval(update_storage_statistics_interval_id);
-					update_storage_statistics_interval_id = 0;
+					clearInterval(updateStorageStatisticsIntervalId);
+					updateStorageStatisticsIntervalId = 0;
 				}
 			});
 		}
@@ -417,6 +435,7 @@ function scanFiles(force, dir, users) {
 	scannerEventSource.listen('done',function(count) {
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
+		Files.updateStorageStatistics();
 	});
 	scannerEventSource.listen('user',function(user) {
 		console.log('scanning files for ' + user);