diff --git a/lib/client/terminal.js b/lib/client/terminal.js
index 64cf1dee..ff833be5 100644
--- a/lib/client/terminal.js
+++ b/lib/client/terminal.js
@@ -109,9 +109,19 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal;
         }
         
         function addListeners(callback) {
-            var socket  = CloudCmd.Socket;
+            var socket  = CloudCmd.Socket,
+                options = {
+                    'connect': function() {
+                        write(socket.CONNECTED + '\r');
+                    },
+                    'disconnect': function() {
+                        write(socket.DISCONNECTED +'\r');
+                    },
+                };
             
-            socket.on(CHANNEL, write);
+            options[CHANNEL] = write;
+            
+            socket.on(options);
             
             Term.on('data', function(data) {
                 socket.emit(CHANNEL, data);