diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 5963d260..51faf83a 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -606,7 +606,7 @@ def edit():
     elif filename[-4:] == '.css':
         filetype = 'css'
     elif filename[-3:] == '.js':
-        filetype = 'js'
+        filetype = 'javascript'
     else:
         filetype = 'html'
 
diff --git a/applications/admin/views/default/edit_js.html b/applications/admin/views/default/edit_js.html
index 7562d108..8096fbd9 100644
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -78,7 +78,7 @@
             return marker;
        }
 
-        {{if filetype in ('html', 'js', 'css'):}}
+        {{if filetype in ('html', 'javascript', 'css'):}}
         // must be here or break emmet/zencoding 
         CodeMirror.defaults.extraKeys["Ctrl-S"] =
             function(instance) {