diff --git a/lib/client/edit.js b/lib/client/edit.js
index 35ffd774..f7fee239 100644
--- a/lib/client/edit.js
+++ b/lib/client/edit.js
@@ -40,7 +40,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
                     Ace.focus();
                 }
             };
-            
+        
        function init(callback) {
             Util.exec.series([
                 CloudCmd.View,
@@ -129,16 +129,18 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
         this.setModeForPath             = function(name) {
             var modesByName = Modelist.modesByName,
                 mode        = Modelist.getModeForPath(name).mode,
-            
+                
                 htmlMode    = modesByName.html.mode,
                 jsMode      = modesByName.javascript.mode,
-            
+                
                 isHTML      = mode === htmlMode,
                 isJS        = mode === jsMode;
             
             Session.setMode(mode);
             setUseOfWorker(mode);
-            setEmmet(isHTML);
+            
+            if (isHTML)
+                setEmmet();
             
             if (isJS && Session.getUseWorker())
                 setJsHintConfig();
@@ -168,34 +170,30 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
             }
         }
         
-        function setEmmet(isHTML) {
+        function setEmmet() {
             DOM.Files.get('edit', function(error, config) {
                 var extensions  = config.extensions,
                     isEmmet     = extensions.emmet;
                 
-                if (isEmmet && isHTML)
+                if (isEmmet)
                     Util.exec.if(Emmet, function() {
-                            Ace.setOption('enableEmmet', isHTML);
-                        }, function(callback) {
-                            var url;
+                        Ace.setOption('enableEmmet', true);
+                    }, function(callback) {
+                        var url;
+                        
+                        url = join([
+                            DIR + 'emmet.js',
+                            DIR + 'ext-emmet.js'
+                        ]);
+                        
+                        DOM.load.js(url, function() {
+                            Emmet = ace.require('ace/ext/emmet');
+                            Emmet.setCore(window.emmet);
                             
-                            if (!isHTML) {
-                                callback();
-                            } else {
-                                url = join([
-                                    DIR + 'emmet.js',
-                                    DIR + 'ext-emmet.js'
-                                ]);
-                                
-                                DOM.load.js(url, function() {
-                                    Emmet = ace.require('ace/ext/emmet');
-                                    Emmet.setCore(window.emmet);
-                                    
-                                    callback();
-                                });
-                            }
+                            callback();
                         });
                     });
+                });
         }
         
         function setUseOfWorker(mode) {