diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index fa5c0c00986..1770bdd5a7b 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -96,6 +96,8 @@
 				this.model.saveLinkShare({
 					expireDate: ''
 				});
+			} else {
+				this.$el.find('#expirationDate').focus();
 			}
 		},