diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js
index 5ae80bcd524e0e333b795b82107f3ee45cc4c3c1..d2ca2d677cc8ba55469d2631fe02b559a3cf0074 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js
@@ -52,6 +52,7 @@ export default () => {
 
   return (
     <AnswerInput
+      aria-label="answer input"
       onBlur={saveAnswer}
       onChange={setAnswerInput}
       onFocus={onFocus}
diff --git a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
index 11095d07395a9399c5363d828283415551a30dca..694e4b7625e9c79be39dc3cac4645decb9ee3f3b 100644
--- a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
@@ -16,15 +16,13 @@ import {
   useOnClickOutside,
 } from 'wax-prosemirror-core';
 
-const Wrapper = styled.div`
-  opacity: ${props => (props.disabled ? '0.4' : '1')};
-`;
+const Wrapper = styled.div``;
 
 const DropDownButton = styled.button`
   background: #fff;
   border: none;
   color: #000;
-  cursor: ${props => (props.disabled ? `not-allowed` : `pointer`)};
+  cursor: ${props => (props.disabled ? `cursor` : `pointer`)};
   display: flex;
   position: relative;
   width: 160px;