diff --git a/javascript/src/QfqForm.js b/javascript/src/QfqForm.js
index 3a151bf0c8d25690cc4883bfca76ecd83112ec55..975f4eef64e6aeb5fac1a99c611638c810296f91 100644
--- a/javascript/src/QfqForm.js
+++ b/javascript/src/QfqForm.js
@@ -51,6 +51,7 @@ var QfqNS = QfqNS || {};
         this.getDeleteButton().click(this.handleDeleteClick.bind(this));
 
         this.setupFormUpdateHandler();
+        this.setupEnterKeyHandler();
 
         this.fileUploader = new n.FileUpload('#' + this.formId, this.fileUploadTo);
         this.fileUploader.on('fileupload.started', this.startUploadHandler);
@@ -77,6 +78,22 @@ var QfqNS = QfqNS || {};
 
     n.QfqForm.prototype.on = n.EventEmitter.onMixin;
 
+    /**
+     * @private
+     */
+    n.QfqForm.prototype.setupEnterKeyHandler = function () {
+        $("input").keyup(function (event) {
+            if (event.which === 13) {
+                if (this.form.formChanged) {
+                    this.getSaveButton().trigger("click");
+                }
+                event.preventDefault();
+            }
+        }.bind(this));
+    };
+
+
+
     /**
      *
      * @private