diff --git a/wax-prosemirror-core/src/utilities/commands/Commands.js b/wax-prosemirror-core/src/utilities/commands/Commands.js
index b096a3efd040ebac88354d4a1ff7f1fcc97a87ff..99c34a84eb224e16eb38666c2cecb4321974da10 100644
--- a/wax-prosemirror-core/src/utilities/commands/Commands.js
+++ b/wax-prosemirror-core/src/utilities/commands/Commands.js
@@ -258,7 +258,6 @@ const isParentOfType = (state, nodeType) => {
   const predicate = node => node.type === nodeType;
   for (let i = state.selection.$from.depth; i > 0; i -= 1) {
     const node = state.selection.$from.node(i);
-    console.log(node);
     if (predicate(node)) {
       status = true;
     }
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
index d2dc43cfbc53bfcae8d1c230815c9e3a716d289b..74d502fada983d25bb4772c5ed42074f618808c9 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
@@ -28,6 +28,10 @@ class TrueFalseQuestion extends Tools {
   get active() {
     return state => {
       if (
+        Commands.isParentOfType(
+          state,
+          state.config.schema.nodes.true_false_container,
+        ) ||
         Commands.isParentOfType(state, state.config.schema.nodes.true_false) ||
         Commands.isParentOfType(
           state,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js
index ce39f1988a081d0aea143e10a8fc947b22c50963..6eea810093353686b644ccb0bd371d523243ffdf 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js
@@ -28,6 +28,10 @@ class TrueFalseSingleCorrectQuestion extends Tools {
   get active() {
     return state => {
       if (
+        Commands.isParentOfType(
+          state,
+          state.config.schema.nodes.true_false_single_correct_container,
+        ) ||
         Commands.isParentOfType(
           state,
           state.config.schema.nodes.true_false_single_correct,
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
index 0c7a842ae63554f18b6460da58877848a38c50cd..23e1230204f96a8547319764d83b1877f7152547 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
@@ -133,7 +133,6 @@ const DropDownComponent = ({ view, tools }) => {
     dropDownOptions.forEach(option => {
       if (option.item.active(main.state)) {
         setLabel(option.label);
-        setTimeout(() => {});
       }
     });
   }, [activeViewId]);