diff --git a/plugins/c9.cli.bridge/bridge-service.js b/plugins/c9.cli.bridge/bridge-service.js
index 652ea360..d1108dea 100644
--- a/plugins/c9.cli.bridge/bridge-service.js
+++ b/plugins/c9.cli.bridge/bridge-service.js
@@ -98,9 +98,9 @@ module.exports = function (vfs, options, register) {
             
             createListenServer(api);
             
-            stream.on("data", function(data){
+            stream.write = function(data){
                 if (client) client.write(data);
-            });
+            };
         },
         
         disconnect: function(){
diff --git a/plugins/c9.ide.terminal/tmux_connection.js b/plugins/c9.ide.terminal/tmux_connection.js
index fafcfadb..3cd642fc 100644
--- a/plugins/c9.ide.terminal/tmux_connection.js
+++ b/plugins/c9.ide.terminal/tmux_connection.js
@@ -157,6 +157,9 @@ 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