diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index a5cf57d0ac..2b7e84c987 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -134,9 +134,19 @@ thead {
 	margin: 2px 0 !important;
 }
 
+#save-button-confirm:disabled,
+#save-button-confirm:disabled:hover,
+#save-button-confirm:disabled:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+	filter: alpha(opacity=20);
+	opacity: .2;
+	cursor: default;
+}
+
 #save-button-confirm:hover,
 #save-button-confirm:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
+	cursor: pointer;
 }
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 1c3d4b9ac3..16b4f1589b 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -228,6 +228,14 @@ OCA.Sharing.PublicApp = {
 			OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected);
 		});
 
+		$('#remote_address').on("keyup paste", function() {
+			if ($(this).val() === '') {
+				$('#save-button-confirm').prop('disabled', true);
+			} else {
+				$('#save-button-confirm').prop('disabled', false);
+			}
+		});
+
 		$('#save #save-button').click(function () {
 			$(this).hide();
 			$('.save-form').css('display', 'inline');
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index cde28c80fc..06d797c3c6 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -76,7 +76,7 @@ $thumbSize = 1024;
 					<button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button>
 					<form class="save-form hidden" action="#">
 						<input type="text" id="remote_address" placeholder="example.com/owncloud"/>
-						<button id="save-button-confirm" class="icon-confirm svg"></button>
+						<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
 					</form>
 				</span>
 				<?php } ?>