diff --git a/lib/client/edit.js b/lib/client/edit.js
index 44de7838..7af5386f 100644
--- a/lib/client/edit.js
+++ b/lib/client/edit.js
@@ -65,7 +65,10 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch;
                 if (!Modelist)
                     Modelist = ace.require('ace/ext/modelist');
                 
-                lMode = Modelist.getModeForPath(lName).mode;
+                if (DOM.isCurrentIsDir())
+                    lMode = Modelist.modesByName.json.mode
+                else
+                    lMode = Modelist.getModeForPath(lName).mode;
                 Session.setMode(lMode);
                 
                 Ace.setOptions({