diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
index f5e071d1d156bdcf495ff4ece5d199c29247b01c..43b9a8450dd95f43c91142851cc4017fe44bee6e 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
@@ -85,6 +85,7 @@ export default ({ node, view, getPos }) => {
   const context = useContext(WaxContext);
   const {
     view: { main },
+    activeViewId,
   } = context;
 
   const isEditable = main.props.editable(editable => {
@@ -152,6 +153,8 @@ export default ({ node, view, getPos }) => {
   };
 
   const saveFeedBack = () => {
+    const sel = context.view[activeViewId].state.selection;
+    console.log(sel);
     setTimeout(() => {
       context.view.main.dispatch(
         context.view.main.state.tr.setNodeMarkup(getPos(), undefined, {
@@ -160,6 +163,17 @@ export default ({ node, view, getPos }) => {
         }),
       );
     }, 150);
+    setTimeout(() => {
+      context.view[activeViewId].dispatch(
+        context.view[activeViewId].state.tr.setSelection(
+          TextSelection.between(
+            context.view[activeViewId].state.selection.$anchor,
+            context.view[activeViewId].state.selection.$head,
+          ),
+        ),
+      );
+      context.view[activeViewId].focus();
+    }, 200);
   };
 
   const onFocus = () => {