diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index 2ecf079e..ca64fc3c 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -1829,7 +1829,7 @@ module.exports = function setup(fsOptions) {
                     options.command = "echo '[Idle]'";
                 
                 if (options.terminal)
-                    args.push("export ISOUTPUTPANE=0;" + BASH + " -l");
+                    args.push("export ISOUTPUTPANE=0; export EDITOR='`which c9` open --wait'; " + BASH + " -l");
                     
                 else if (options.command)
                     args.push((BASH + " -l -c '"
diff --git a/plugins/c9.ide.terminal/tmux_connection.js b/plugins/c9.ide.terminal/tmux_connection.js
index 3cd642fc..fafcfadb 100644
--- a/plugins/c9.ide.terminal/tmux_connection.js
+++ b/plugins/c9.ide.terminal/tmux_connection.js
@@ -157,9 +157,6 @@ module.exports = function(c9, proc, installPath, shell) {
             options.output = false;
             options.terminal = true;
             options.detachOthers = !session.hasConnected;
-            options.env = {
-                "EDITOR": "`which c9` open --wait"
-            };
         }
         
         // Connect to backend and start tmux session