diff --git a/src/components/dialogs/dialog.js b/src/components/dialogs/dialog.js
index d3bb657..db4c6a4 100644
--- a/src/components/dialogs/dialog.js
+++ b/src/components/dialogs/dialog.js
@@ -31,13 +31,21 @@ class Dialog extends React.Component {
     this.props.onClose(true);
   }
 
+  /**
+   * To prevent Enter hanlding user onKeyPress={this.handleKeyIgnore} in that form element
+   * and the following handler in the corresponding file:
+   *
+   * //this function prevents a keystroke from beeing handled by dialog.js
+   * handleKeyIgnore(event){
+   *   event.stopPropagation();
+   * }
+   */
   onKeyPress = (event) => {
-    /*if (event.key === 'Enter') {
+    if (event.key === 'Enter') {
       // prevent input from submitting
       event.preventDefault();
-
       this.closeModal(false);
-    }*/
+    }
   }
 
   render() {
diff --git a/src/components/dialogs/edit-widget-html-content.js b/src/components/dialogs/edit-widget-html-content.js
index 22cc10b..3b02bc3 100644
--- a/src/components/dialogs/edit-widget-html-content.js
+++ b/src/components/dialogs/edit-widget-html-content.js
@@ -31,15 +31,20 @@ class EditWidgetHTMLContent extends React.Component {
     };
   }
 
+  handleKeyIgnore(event){
+  // This function prevents a keystroke from beeing handled by dialog.js
+  event.stopPropagation();
+  }
+
   componentWillReceiveProps(nextProps) {
-      // Update state's widget with props
+    // Update state's widget with props
     this.setState({ widget: nextProps.widget });
   }
 
   render() {
     return <FormGroup controlId={this.props.controlId}>
       <ControlLabel>HTML Content</ControlLabel>
-      <FormControl componentClass="textarea" style={{ height: 200 }} placeholder={this.props.placeholder} value={this.state.widget[this.props.controlId] || ''} onChange={e => this.props.handleChange(e)} />
+      <FormControl onKeyPress={this.handleKeyIgnore} componentClass="textarea" style={{ height: 200 }} placeholder={this.props.placeholder} value={this.state.widget[this.props.controlId] || ''} onChange={e => this.props.handleChange(e)} />
     </FormGroup>;
   }
 }