diff --git a/lib/client/edit.js b/lib/client/edit.js
index 90f8f950..1f54cc75 100644
--- a/lib/client/edit.js
+++ b/lib/client/edit.js
@@ -134,14 +134,15 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
                 isHTML      = mode === htmlMode,
                 isJS        = mode === jsMode;
             
-            Session.setMode(mode);
-            setUseOfWorker(mode);
+            Session.setMode(mode, function() {
+                setUseOfWorker(mode);
             
-            if (isHTML)
-                setEmmet();
-            
-            if (isJS && Session.getUseWorker())
-                setJsHintConfig();
+                if (isHTML)
+                    setEmmet();
+                
+                if (isJS && Session.getUseWorker())
+                    setJsHintConfig();
+            });
         };
         
         this.setMode                    = function(mode) {