diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 1745eba584..7597004e68 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -6,7 +6,6 @@
 
 .shareTabView .shareWithLoading {
 	padding-left: 10px;
-	position: relative;
 	right: 30px;
 	top: 2px;
 }
@@ -73,9 +72,18 @@
 }
 
 .shareTabView .icon-loading-small {
-	position: absolute;
 	display: inline-block;
 	z-index: 1;
 	background-color: white;
-	padding: 2px;
+	padding: 2px 0;
 }
+
+.shareTabView .shareWithList .icon-loading-small,
+.shareTabView .linkShareView .icon-loading-small {
+	position: absolute;
+}
+
+.shareTabView .linkPass .icon-loading-small {
+	margin-top: 9px;
+}
+
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index dfd9bdc2f4..beb8b01c8a 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -141,6 +141,7 @@
 					this.$el.find('.linkPassText').focus();
 				}
 			} else {
+				$loading.removeClass('hidden');
 				if (this.model.get('linkShare').isLinkShare) {
 					this.model.removeLinkShare();
 				} else {