diff --git a/wax-prosemirror-services/src/MatchingService/components/EditorComponent.js b/wax-prosemirror-services/src/MatchingService/components/EditorComponent.js
index c467ede772d133532a741375a6a747f220adb4f4..c66af0e13360d20bb17dfcc7546391ed8086a037 100644
--- a/wax-prosemirror-services/src/MatchingService/components/EditorComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/EditorComponent.js
@@ -159,7 +159,7 @@ const EditorComponent = ({ node, view, getPos }) => {
       },
       questionId,
     );
-    if (questionView.hasFocus()) questionView.focus();
+    questionView.focus();
   }, []);
 
   const dispatchTransaction = tr => {
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index e7bd2da50f6d568a9bdbe390dc8db8973fe07bbd..2a18957e841b3fd4ab3f19fd2cf6fe20b3cbb127 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -156,6 +156,7 @@ export default ({ node, view, getPos }) => {
       setAddingOption(false);
     });
     setOptionText('');
+    addOptionRef.current.focus();
   };
 
   const updateOptionText = () => {
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
index c2f6a1d3440e4e875485fa35b2f2e8116dc268d6..7c9f90fdf3315905689212964a8bfc41f58ac9e3 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
@@ -88,8 +88,6 @@ export default ({ node, view, getPos }) => {
     });
   };
 
-  const options = [];
-
   return (
     <Option>
       {!readOnly && (