diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index d16bea97a..8cb1b7c2e 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -62,15 +62,16 @@ define([
         });
 
         editor._noCursorUpdate = false;
-        editor.state.focused = true;
+        editor.scrollTo(scroll.left, scroll.top);
+
+        if (!editor.state.focused) { return; }
+
         if(selects[0] === selects[1]) {
             editor.setCursor(posToCursor(selects[0], remoteDoc));
         }
         else {
             editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
         }
-
-        editor.scrollTo(scroll.left, scroll.top);
     };
 
     module.getHeadingText = function (editor) {