diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js
index 19f54f6c..908962cc 100644
--- a/app/scripts/views/fields/field-view-text.js
+++ b/app/scripts/views/fields/field-view-text.js
@@ -125,8 +125,9 @@ var FieldViewText = FieldView.extend({
         var code = e.keyCode || e.which;
         if (code === Keys.DOM_VK_RETURN) {
             if (!this.model.multiline || (!e.altKey && !e.shiftKey && !e.ctrlKey)) {
+                let value = this.gen ? this.gen.password : e.target.value;
                 this.stopListening(Backbone, 'click', this.fieldValueBlur);
-                this.endEdit(e.target.value);
+                this.endEdit(value);
             }
         } else if (code === Keys.DOM_VK_ESCAPE) {
             this.stopListening(Backbone, 'click', this.fieldValueBlur);
@@ -135,6 +136,9 @@ var FieldViewText = FieldView.extend({
             e.preventDefault();
             this.stopListening(Backbone, 'click', this.fieldValueBlur);
             this.endEdit(e.target.value, { tab: { field: this.model.name, prev: e.shiftKey } });
+        } else if (code === Keys.DOM_VK_G) {
+            e.preventDefault();
+            this.showGenerator();
         }
     },
 
diff --git a/release-notes.md b/release-notes.md
index 4245f591..0fa57c9b 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -11,6 +11,7 @@ Release notes
 `+` option to preload default config and file  
 `+` save displayed table columns  
 `+` confirmation in password change dialog  
+`+` inline generator keyboard management  
 `-` fix app redraw in background  
 `-` fix idle timer on computer sleep