diff --git a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
index 477d84bd22a3648d62053214881e8d3bf53fb909..188a7ad6be2664e3b9f2400bdf8c3cbe39148691 100644
--- a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
@@ -115,7 +115,7 @@ const DropComponent = ({ getPos, node, view }) => {
       setTimeout(() => {
         console.log('here?', activeView);
         activeView.focus();
-      }, 100);
+      });
   };
 
   const onKeyDown = (e, index) => {
@@ -169,7 +169,6 @@ const DropComponent = ({ getPos, node, view }) => {
             }
           }}
           onMouseDown={openCloseMenu}
-          tabIndex="0"
           type="button"
         >
           {selectedOption === null || !selectedOption
diff --git a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js
index b0ffd7a865c22143b66f1afc44cdebf58d80e3a3..442403cce03bccba0c0495cb5c85868017eb8bef 100644
--- a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js
+++ b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js
@@ -143,7 +143,6 @@ const TableDropDown = ({ item }) => {
             }
           }}
           onMouseDown={openCloseMenu}
-          tabIndex="0"
           type="button"
         >
           <span>Table Options</span> <StyledIcon name="expand" />
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
index 05545cac61b1d68ff6b375819b7451d52300a4df..a5487e967b34e59df33224c500d8a6d4d27e6383 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
@@ -202,7 +202,6 @@ const DropDownComponent = ({ view, tools }) => {
             }
           }}
           onMouseDown={openCloseMenu}
-          tabIndex="0"
           type="button"
         >
           <span>{label}</span> <StyledIcon name="expand" />