diff --git a/lib/client/console.js b/lib/client/console.js
index cd22ceb2..c3af8bf6 100644
--- a/lib/client/console.js
+++ b/lib/client/console.js
@@ -167,6 +167,13 @@ var CloudCmd, Util, DOM, CloudFunc, $;
             Util.time(Name + ' load');
         }
         
+        function isPrompt() {
+            var state   = jqconsole.GetState(),
+                is      = state === 'prompt';
+            
+            return is;
+        }
+        
         function addListeners(callback) {
             var options = {
                 'connect'   : function() {
@@ -174,11 +181,11 @@ var CloudCmd, Util, DOM, CloudFunc, $;
                 },
                 
                 'disconnect': function() {
-                    var state = jqconsole.GetState();
+                    var is = isPrompt();
                     
                     error(Socket.DISCONNECTED);
                     
-                    if (state === 'prompt')
+                    if (is)
                         jqconsole.AbortPrompt();
                 }
             };
@@ -191,6 +198,8 @@ var CloudCmd, Util, DOM, CloudFunc, $;
         }
         
         function onMessage(json) {
+            var is = isPrompt();
+            
             if (json) {
                 Util.log(json);
                 
@@ -201,7 +210,8 @@ var CloudCmd, Util, DOM, CloudFunc, $;
                     jqconsole.SetPromptLabel(json.path + '> ');
             }
             
-            jqconsole.Prompt(true, handler);
+            if (!is)
+                jqconsole.Prompt(true, handler);
         }
         
         init();