diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js
index 60e50541..c6d5e129 100644
--- a/plugins/c9.ide.ace/ace.js
+++ b/plugins/c9.ide.ace/ace.js
@@ -1375,7 +1375,7 @@ define(function(require, exports, module) {
         }
         
         function getMode(syntax) {
-            syntax = (syntax || "text").toLowerCase();
+            syntax = (syntax || settings.get("project/ace/@defaultSyntax") || "text").toLowerCase();
             if (syntax.indexOf("/") == -1)
                 syntax = "ace/mode/" + syntax;
     
diff --git a/plugins/c9.ide.panels/area.js b/plugins/c9.ide.panels/area.js
index 7b11cca2..3c6d6686 100644
--- a/plugins/c9.ide.panels/area.js
+++ b/plugins/c9.ide.panels/area.js
@@ -44,7 +44,7 @@ define(function(require, module, exports) {
                 column.setWidth(CURWIDTH);
                 column.setAttribute("class", where);
                 
-                column.oncontextmenu = function(e) {
+                bar.oncontextmenu = function(e) {
                     var menu = menus.get("Window").menu;
                     menu.display(e.x, e.y);
                     menu.childNodes.forEach(function(x) {
diff --git a/plugins/c9.ide.tree/favorites.js b/plugins/c9.ide.tree/favorites.js
index bd430aec..71a47501 100644
--- a/plugins/c9.ide.tree/favorites.js
+++ b/plugins/c9.ide.tree/favorites.js
@@ -22,6 +22,8 @@ define(function(require, exports, module) {
         
         var basename = require("path").basename;
         var dirname = require("path").dirname;
+        var escapeHTML = require("ace/lib/lang").escapeHTML;
+
         
         /***** Initialization *****/
         
@@ -650,9 +652,9 @@ define(function(require, exports, module) {
             model.getCaptionHTML = function(node) {
                 if (node.isFavorite) {
                     var path = node.labelPath || node.path;
-                    return basename(path) 
+                    return escapeHTML(basename(path)) 
                         + "<span class='extrainfo'> - " 
-                        + dirname(path) + "</span>";
+                        + escapeHTML(dirname(path)) + "</span>";
                 }
                 else
                     return getCaptionHTML.call(model, node);