diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 70d5d619c1..2d93bc1799 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -292,6 +292,24 @@ OCA.Sharing.PublicApp = {
 	},
 
 	_saveToOwnCloud: function (remote, token, owner, ownerDisplayName, name, isProtected) {
+		var toggleLoading = function() {
+			var iconClass = $('#save-button-confirm').attr('class');
+			var loading = iconClass.indexOf('icon-loading-small') !== -1;
+			if(loading) {
+				$('#save-button-confirm')
+				.removeClass("icon-loading-small")
+				.addClass("icon-confirm");
+				
+			}
+			else {
+				$('#save-button-confirm')
+				.removeClass("icon-confirm")
+				.addClass("icon-loading-small");
+
+			}
+		};
+
+		toggleLoading();
 		var location = window.location.protocol + '//' + window.location.host + OC.webroot;
 		
 		if(remote.substr(-1) !== '/') {
@@ -309,6 +327,7 @@ OCA.Sharing.PublicApp = {
 			// this check needs to happen on the server due to the Content Security Policy directive
 			$.get(OC.generateUrl('apps/files_sharing/testremote'), {remote: remote}).then(function (protocol) {
 				if (protocol !== 'http' && protocol !== 'https') {
+					toggleLoading();
 					OC.dialogs.alert(t('files_sharing', 'No ownCloud installation (7 or higher) found at {remote}', {remote: remote}),
 						t('files_sharing', 'Invalid ownCloud url'));
 				} else {