diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index d0c78713f6b9bac2cdabebbf787fad94112a384d..60c9103f0536c5e6c674ce0ee73bd3301cbc59c3 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -162,15 +162,15 @@ const Hhmi = () => {
         </SubmitButton>
       </ButtonContainer>
       <Wax
-        config={config}
         autoFocus
-        ref={editorRef}
+        config={config}
         customValues={{ showFeedBack: submitted, testMode }}
         fileUpload={file => renderImage(file)}
-        value={content}
+        layout={HhmiLayout}
         // targetFormat="JSON"
         readonly={readOnly}
-        layout={HhmiLayout}
+        ref={editorRef}
+        value={content}
         // onChange={source => console.log(source)}
       />
     </>
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index 58040e5e208f65aec61206c3b8af0b079e153379..8337f042379bc9eb07669d82d19f142666dc4e1d 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -26,6 +26,7 @@ export default class MultipleChoiceNodeView extends QuestionsNodeView {
     if (
       !event.target.type ||
       event.target.type === 'button' ||
+      event.target.type === 'text' ||
       event.target.type === 'textarea'
     ) {
       return true;
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
index ce3ed262fc3fba2a9156050158b813b6db5fd7ac..9204b81b4cb7766c90e62536f015161b905005c3 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
@@ -26,6 +26,7 @@ export default class MultipleChoiceSingleCorrectNodeView extends QuestionsNodeVi
     if (
       !event.target.type ||
       event.target.type === 'button' ||
+      event.target.type === 'text' ||
       event.target.type === 'textarea'
     ) {
       return true;
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
index 31b4e304ae2b827d6dba98862aab63d01e34a0c2..aa47023df082c29d973ddd69cbbba52290406d23 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
@@ -23,7 +23,12 @@ export default class QuestionTrueFalseNodeView extends QuestionsNodeView {
   }
 
   stopEvent(event) {
-    if (event.target.type === 'textarea') {
+    if (
+      !event.target.type ||
+      event.target.type === 'button' ||
+      event.target.type === 'text' ||
+      event.target.type === 'textarea'
+    ) {
       return true;
     }
     const innerView = this.context.pmViews[this.node.attrs.id];
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
index 527a485f0b8aac04f698706f5f1c83e19faf4bd5..b52a9db18eca1626ccc839202067fab9a7f12b2a 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
@@ -26,6 +26,7 @@ export default class TrueFalseNodeView extends QuestionsNodeView {
     if (
       !event.target.type ||
       event.target.type === 'button' ||
+      event.target.type === 'text' ||
       event.target.type === 'textarea'
     ) {
       return true;
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
index bd8f9a2c3563a712001397046fc94d1b0a165da4..8aacd755a236728c5c69affb41aaf60abd5b2b5f 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
@@ -23,7 +23,12 @@ export default class QuestionTrueFalseSingleNodeView extends QuestionsNodeView {
   }
 
   stopEvent(event) {
-    if (event.target.type === 'textarea') {
+    if (
+      !event.target.type ||
+      event.target.type === 'button' ||
+      event.target.type === 'text' ||
+      event.target.type === 'textarea'
+    ) {
       return true;
     }
     const innerView = this.context.pmViews[this.node.attrs.id];
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
index c94c3fc49461630a8f4cfaa09f69d047cf0a6899..0d86be0e0bc4091c771586d493cf6cfdd70337f0 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
@@ -26,6 +26,7 @@ export default class TrueFalseSingleCorrectNodeView extends QuestionsNodeView {
     if (
       !event.target.type ||
       event.target.type === 'button' ||
+      event.target.type === 'text' ||
       event.target.type === 'textarea'
     ) {
       return true;