diff --git a/core/js/share.js b/core/js/share.js
index 5cabc61456..03202c1a61 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -500,15 +500,16 @@ OC.Share={
 		$('#emailPrivateLink #email').hide();
 		$('#emailPrivateLink #emailButton').hide();
 		$('#allowPublicUploadWrapper').hide();
+		$('#expirationDate').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 	showExpirationDate:function(date) {
 		$('#expirationCheckbox').attr('checked', true);
-		$('#expirationDate').before('<br />');
 		$('#expirationDate').val(date);
-		$('#expirationDate').show();
+		$('#expirationDate').show('blind');
+		$('#expirationDate').css('display','block');
 		$('#expirationDate').datepicker({
 			dateFormat : 'dd-mm-yy'
 		});
@@ -578,7 +579,7 @@ $(document).ready(function() {
 			OC.Share.itemShares[shareType].splice(index, 1);
 			OC.Share.updateIcon(itemType, itemSource);
 			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-				$('#expiration').hide();
+				$('#expiration').hide('blind');
 			}
 		});
 		return false;
@@ -638,7 +639,7 @@ $(document).ready(function() {
 				OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
 				OC.Share.updateIcon(itemType, itemSource);
 				if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-					$('#expiration').hide();
+					$('#expiration').hide('blind');
 				}
 			});
 		}
@@ -730,7 +731,7 @@ $(document).ready(function() {
 				if (!result || result.status !== 'success') {
 					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
 				}
-				$('#expirationDate').hide();
+				$('#expirationDate').hide('blind');
 			});
 		}
 	});