diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 4457dddbe1..d01a07447a 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -2,6 +2,7 @@ $(document).ready(function() {
 	var shared_status = {};
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Share', function(filename) {
+			if (scanFiles.scanning){return;}//workaround to prevent aditional http request block scanning feedback
 			var icon;
 			var file = $('#dir').val()+'/'+filename;
 			if(shared_status[file])
diff --git a/files/js/files.js b/files/js/files.js
index 0eca0959de..bebcf4e97a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -347,6 +347,7 @@ $(document).ready(function() {
 
 function scanFiles(force){
 	force=!!force; //cast to bool
+	scanFiles.scanning=true;
 	$('#scanning-message').show();
 	$('#fileList').remove();
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
@@ -356,6 +357,7 @@ function scanFiles(force){
 		$('#scan-current').text(data.file+'/');
 	});
 	scannerEventSource.listen('success',function(success){
+		scanFiles.scanning=false;
 		if(success){
 			window.location.reload();
 		}else{
@@ -363,6 +365,7 @@ function scanFiles(force){
 		}
 	});
 }
+scanFiles.scanning=false;
 
 function boolOperationFinished(data, callback) {
 	result = jQuery.parseJSON(data.responseText);