diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
index 463380b6bca75797bc5a538a0f6479a9d2ef555a..335b8347c538e1aead0cac2cb0b32bae0f6acd45 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
@@ -29,6 +29,9 @@ export default class BulletList extends Tools {
     } = state;
     let status = true;
 
+    if (!wrapInList(state.config.schema.nodes.bulletlist)(activeView.state))
+      status = false;
+
     if ('subList' in this.config && !this.config.subList) {
       state.doc.nodesBetween(from, to, node => {
         if (node.type.name === 'list_item') status = false;
@@ -38,6 +41,7 @@ export default class BulletList extends Tools {
     if (from === null) return false;
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('Lists')) status = false;
+
     return status;
   };
 
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
index f6e5b4f2969d272204ddb473acc822d8533177e0..44c7caac043560a34f18e5c32cc0bbb47ac126b1 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
@@ -27,6 +27,9 @@ export default class OrderedList extends Tools {
     } = state;
     let status = true;
 
+    if (!wrapInList(state.config.schema.nodes.bulletlist)(activeView.state))
+      status = false;
+
     if ('subList' in this.config && !this.config.subList) {
       state.doc.nodesBetween(from, to, node => {
         if (node.type.name === 'list_item') status = false;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
index dc9dc917d3e9ef9600e66de4a6dd98484b6211c2..92912ce68d36c2b9dde81385f0f4a2156f144eee 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
@@ -4,7 +4,7 @@ const questionSingleNode = {
     class: { default: 'multiple-choice-question-single' },
   },
   group: 'block questions',
-  content: 'block*',
+  content: 'paragraph* bulletlist* orderedlist*',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
index 46a41394a6ebe3c4aad18f167caf57c58068faa6..992f9625f5da6f44beb4fcdd42ece1d1612bc3e2 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
@@ -4,7 +4,7 @@ const questionTrueFalseNode = {
     class: { default: 'true-false-question' },
   },
   group: 'block questions',
-  content: 'block*',
+  content: 'paragraph* bulletlist* orderedlist*',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
index f3385105c3cdc38c72cec984e973065f1e9799a1..f4c1503664b27b546cab4c171f46ec3d62ac321f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
@@ -4,7 +4,7 @@ const questionTrueFalseNode = {
     class: { default: 'true-false-question-single' },
   },
   group: 'block questions',
-  content: 'block*',
+  content: 'paragraph* bulletlist* orderedlist*',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
index fa591559f05643a0913749dc6865df6effc6313c..99012468f07b19cce85d463e9b91e033ac715f93 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
@@ -4,7 +4,7 @@ const questionNode = {
     id: { default: '' },
   },
   group: 'block questions',
-  content: 'block*',
+  content: 'paragraph* bulletlist* orderedlist*',
   defining: true,
 
   parseDOM: [
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js b/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js
index 88a2cc6504159ed032667d41dbbaa34e5d7036d7..013ff9279711a141fd8de246415d801c97b0cb22 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js
@@ -9,7 +9,7 @@ const multipleDropDownContainerNode = {
   selectable: false,
   draggable: false,
   defining: true,
-  content: 'block*',
+  content: 'paragraph* bulletlist* orderedlist*',
   parseDOM: [
     {
       tag: 'div.multiple-drop-down-container',