diff --git a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
index 3c70f371c53227ddcc968fb2bd81cbd8efac81b5..f6b9ec07afec499350ef14136408e0a076cfbbe5 100644
--- a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
+++ b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
@@ -39,7 +39,8 @@ const backSpaceShortCut = (state, dispatch, view) => {
       node.type.name === 'fill_the_gap_container' ||
       node.type.name === 'multiple_drop_down_container' ||
       node.type.name === 'numerical_answer_container' ||
-      node.type.name === 'essay_container'
+      node.type.name === 'essay_container' ||
+      node.type.name === 'matching_container'
     ) {
       dispatch(state.tr.delete(from, from + node.nodeSize));
       // const index = $from.index($from.depth);
diff --git a/wax-questions-service/src/MatchingService/MatchingQuestion.js b/wax-questions-service/src/MatchingService/MatchingQuestion.js
index 57a60d7f828542808683b0c68dda6f0cdbd43e90..c0f6055320739bcd1491e1eb7cb03392e096c9d0 100644
--- a/wax-questions-service/src/MatchingService/MatchingQuestion.js
+++ b/wax-questions-service/src/MatchingService/MatchingQuestion.js
@@ -30,13 +30,13 @@ class MatchingQuestion extends Tools {
       if (!wrapping) return false;
       tr.wrap(range, wrapping);
 
-      const map = tr.mapping.maps[0];
-      let newPos = 0;
-      map.forEach((_from, _to, _newFrom, newTo) => {
-        newPos = newTo;
-      });
+      // const map = tr.mapping.maps[0];
+      // let newPos = 0;
+      // map.forEach((_from, _to, _newFrom, newTo) => {
+      //   newPos = newTo;
+      // });
 
-      tr.setSelection(TextSelection.create(tr.doc, range.$to.pos));
+      tr.setSelection(TextSelection.create(tr.doc, range.$to.pos + 1));
       const option = state.config.schema.nodes.matching_option.create(
         { id: uuidv4(), isfirst: true },
         Fragment.empty,