diff --git a/plugins/c9.cli.bridge/bridge_commands.js b/plugins/c9.cli.bridge/bridge_commands.js
index 62730ba0..1cf86e62 100644
--- a/plugins/c9.cli.bridge/bridge_commands.js
+++ b/plugins/c9.cli.bridge/bridge_commands.js
@@ -47,7 +47,7 @@ define(function(require, exports, module) {
             
             settings.on("read", function(e) {
                 settings.setDefaults("user/terminal", [
-                    ["defaultEditor", "false"]
+                    ["defaultEnvEditor", "false"]
                 ]);
             }, plugin);
             
@@ -56,7 +56,7 @@ define(function(require, exports, module) {
                     "Terminal" : {
                         "Use Cloud9 as the Default Editor" : {
                             type: "checkbox",
-                            path: "user/terminal/@defaultEditor",
+                            path: "user/terminal/@defaultEnvEditor",
                             position: 14000
                         }
                     }
diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
index 05954eb6..6a0fbde2 100644
--- a/plugins/c9.ide.terminal/terminal.js
+++ b/plugins/c9.ide.terminal/terminal.js
@@ -751,7 +751,7 @@ define(function(require, exports, module) {
                 session.__defineGetter__("tab", function(){ return doc.tab });
                 session.__defineGetter__("doc", function(){ return doc });
                 session.__defineGetter__("defaultEditor", function(){ 
-                    return settings.getBool("user/terminal/@defaultEditor");
+                    return settings.getBool("user/terminal/@defaultEnvEditor");
                 });
                 
                 session.attach = function(){