diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index eab2a979c7bd986223d7f42c25ecd9257fd27d80..e5b708061c4b059cb0cc8dfcd2e2e81a8562c41f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -52,6 +52,7 @@ class MultipleChoiceQuestion extends Tools {
   title = 'Add Multiple Choice Question';
   icon = 'multipleChoice';
   name = 'Multiple Choice';
+  label = 'Multiple Choice';
 
   get run() {
     return (view, main, context) => {
@@ -64,7 +65,7 @@ class MultipleChoiceQuestion extends Tools {
     return state => {};
   }
 
-  select = (state, activeViewId, activeView) => {
+  select = (state, activeView) => {
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('MultipleChoice')) return false;
     let status = true;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
index 0126f7cc7c86d054fbc3aa8f96562af003108430..ddee8bbbd00368db3052a91ce0d6c1e61f26ae17 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
@@ -18,12 +18,6 @@ class MultipleDropDown extends ToolGroup {
 
   renderTools(view) {
     if (isEmpty(view)) return null;
-    const context = useContext(WaxContext);
-
-    const {
-      activeViewId,
-      view: { main },
-    } = context;
 
     const Wrapper = styled.div`
       ${ReactDropDownStyles};
@@ -57,11 +51,18 @@ class MultipleDropDown extends ToolGroup {
       }
     `;
 
-    const { dispatch, state } = view;
+    const context = useContext(WaxContext);
+
+    const {
+      activeView,
+      view: { main },
+    } = context;
+    const { state } = view;
+
     const dropDownOptions = [
-      { label: 'Multiple choice ', value: '0', item: this._tools[0] },
+      { label: 'Multiple Choice ', value: '0', item: this._tools[0] },
       {
-        label: 'Multiple choice (single correct)  ',
+        label: 'Multiple Choice (single correct)  ',
         value: '1',
         item: this._tools[0],
       },
@@ -73,8 +74,13 @@ class MultipleDropDown extends ToolGroup {
       },
     ];
 
-    const isDisabled = true;
+    const isDisabled = this._tools[0].select(state, activeView);
     let found = '';
+    dropDownOptions.forEach((item, i) => {
+      if (item.item.select(state, activeView) === false) {
+        found = item.item.label;
+      }
+    });
 
     return (
       <Wrapper key={uuidv4()}>