diff --git a/apps/files_sharing/js/dist/additionalScripts.js b/apps/files_sharing/js/dist/additionalScripts.js
index 27139c9e866607c16758f8041bf12d4f97c06740..984b3324ef8aaa8a3af0148ff566d29ea618f49d 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js and b/apps/files_sharing/js/dist/additionalScripts.js differ
diff --git a/apps/files_sharing/js/dist/additionalScripts.js.map b/apps/files_sharing/js/dist/additionalScripts.js.map
index 6690589aaba77ef6694cb5583231ce9ecc172c44..19bb65160c49310d119a109abacaca5c343e2f21 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js.map and b/apps/files_sharing/js/dist/additionalScripts.js.map differ
diff --git a/apps/files_sharing/src/style/sharetabview.scss b/apps/files_sharing/src/style/sharetabview.scss
index b3753f3f3211afd51c9313db839ee8616f554fcf..d10808a7488aba82b636de201da381f89f5a9e1b 100644
--- a/apps/files_sharing/src/style/sharetabview.scss
+++ b/apps/files_sharing/src/style/sharetabview.scss
@@ -73,6 +73,12 @@
 	}
 	.popovermenu {
 		.linkPassMenu {
+			input.error {
+				border-color: var(--color-error) !important;
+				&[type="submit"] {
+					border-left: none;
+				}
+			}
 			.share-pass-submit {
 				width: auto !important;
 			}
diff --git a/core/js/dist/share_backend.js b/core/js/dist/share_backend.js
index a5d59b4e292ba7191f4a63c443dd5e0b730f3797..c4052be0364b0786400b324f8034c9e67722b072 100644
Binary files a/core/js/dist/share_backend.js and b/core/js/dist/share_backend.js differ
diff --git a/core/js/dist/share_backend.js.map b/core/js/dist/share_backend.js.map
index 24d996720f61eb9c583e648884a15c2a71b55ae9..4d6b7dbd9699958e856ec95e4ac5c71511883726 100644
Binary files a/core/js/dist/share_backend.js.map and b/core/js/dist/share_backend.js.map differ
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 64c221c608e1fe0b453c90950302816544d393c9..609e1741af0f52946affad72369271d6e6eaa806 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -352,6 +352,7 @@
 			}
 			var $input = $li.find('.linkPassText');
 			$input.removeClass('error');
+			$input.parent().find('input').removeClass('error');
 			var password = $input.val();
 
 			if ($li.find('.linkPassText').attr('placeholder') === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
@@ -380,6 +381,9 @@
 					$loading.removeClass('inlineblock').addClass('hidden');
 				},
 				error: function(model, msg) {
+					// Add visual feedback to both the input and the submit button
+					$input.parent().find('input').addClass('error');
+
 					// destroy old tooltips
 					var $container = $input.parent();
 					$container.tooltip('destroy');