diff --git a/CHANGELOG b/CHANGELOG
index 1f3548dd7c8ef61c6c616fb9bce907539d9f5b63..f7468d5796e70a4252c214894ccad00a2e212136 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,8 @@ minerva (15.1.0) unstable; urgency=medium
     CONVERSION (#1300)
   * Small improvement: when uploading complex map with images warnings are
     raised if images are not referenced in coords.txt file (#1308)
+  * Small improvement: hitting enter after filling credentials automatically
+    tries to log in (#1312)
   * Bug fix: export to image from selected polygon contained all elements
     inside rectangle bounded by the polygon coordinates (#1096)
   * Bug fix: continuous refreshing list of project when uploading/removing
diff --git a/frontend-js/src/main/js/gui/LoginDialog.js b/frontend-js/src/main/js/gui/LoginDialog.js
index 30c14c0366fd33d3a4a2aefef8b81d1bbe8731c5..54faf6c76a1bed5d93b49012d02898097e144d63 100644
--- a/frontend-js/src/main/js/gui/LoginDialog.js
+++ b/frontend-js/src/main/js/gui/LoginDialog.js
@@ -134,6 +134,16 @@ LoginDialog.prototype._createLoginTab = function () {
     href: "#"
   }));
 
+  $(loginInput).on('keypress', function (e) {
+    if (e.which === 13) {
+      $(passwordInput).focus();
+    }
+  });
+  $(passwordInput).on('keypress', function (e) {
+    if (e.which === 13) {
+      $(loginButton).click();
+    }
+  });
 };
 
 /**