diff --git a/core/css/share.css b/core/css/share.css
index a8ffc8df42..abaeb07dd8 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -15,4 +15,6 @@ a.showCruds { display:inline; opacity:.5; }
 a.showCruds:hover { opacity:1; }
 a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
-#link { border-top:1px solid #ddd; padding-top:0.5em; }
\ No newline at end of file
+#link { border-top:1px solid #ddd; padding-top:0.5em; }
+input[type="text"], input[type="password"] { width:90%; }
+#linkText, #linkPass { display:none; }
diff --git a/core/js/share.js b/core/js/share.js
index 4c164f65b2..cc862b1c5f 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -130,7 +130,7 @@ OC.Share={
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
-			html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
+			html += '<input id="shareWith" type="text" placeholder="Share with" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
 			if (link) {
@@ -139,8 +139,10 @@ OC.Share={
 				// TODO Change to lock/unlock icon?
 				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
 				html += '<br />';
-				html += '<input id="linkText" style="display:none; width:90%;" readonly="readonly" />';
-				html += '<input id="linkPassText" type="password" placeholder="Password" style="display:none; width:90%;" />';
+				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<div id="linkPass">';
+				html += '<input id="linkPassText" type="password" placeholder="Password" />';
+				html += '</div>'
 				html += '</div>';
 			}
 			html += '</div>';
@@ -408,8 +410,7 @@ $(document).ready(function() {
 	});
 
 	$('#showPassword').live('click', function() {
-		$('#linkText').after('<br />');
-		$('#linkPassText').toggle('blind');
+		$('#linkPass').toggle('blind');
 	});
 
 	$('#linkPassText').live('keyup', function(event) {