1 files changed, 10 insertions, 4 deletions

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 8e541998..f24aff73 100644
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -144,12 +144,18 @@ if (newVersionDismiss != null) {
  * Login button
  */
 var loginButton = document.getElementById('login-button');
+var loginBlock = document.getElementById('header-login-form');
+
 loginButton.addEventListener('click', function(event) {
     event.preventDefault();
-    var loginBlock = document.getElementById('header-login-form');
-    loginBlock.style.display = 'block';
     loginBlock.classList.toggle('open');
-    // Focus on login field.
-    loginBlock.firstElementChild.focus();
     document.getElementById('content').style.boxShadow = 'none';
 });
+
+// Focus on login field.
+loginBlock.addEventListener('transitionend', function() {
+    loginBlock.firstElementChild.focus();
+});
+
+var hiddenReturnurl = document.getElementsByName('returnurl');
+hiddenReturnurl.value = window.location.href;
\ No newline at end of file