diff --git a/vnc.html b/vnc.html
index 4454eba2..ea66975d 100644
--- a/vnc.html
+++ b/vnc.html
@@ -27,6 +27,7 @@
             onblur="RFB.clipboardFocus=false;"></textarea>
     </body>
 
+    <!-- Uncomment to activate firebug lite -->
     <!--
     <script type='text/javascript' 
         src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
diff --git a/vnc.js b/vnc.js
index 5fbaa031..b46aaacf 100644
--- a/vnc.js
+++ b/vnc.js
@@ -941,7 +941,11 @@ init_ws: function () {
         console.log(">> WebSocket.onclose");
         clearInterval(RFB.sendID);
         if (RFB.state != 'disconnected') {
-            RFB.updateState('disconnected', 'VNC disconnected');
+            if (RFB.state == 'failed') {
+                RFB.updateState('disconnected');
+            } else {
+                RFB.updateState('disconnected', 'VNC disconnected');
+            }
         }
         console.log("<< WebSocket.onclose");
     };
@@ -1005,7 +1009,11 @@ disconnect: function () {
         }
     }
 
-    RFB.updateState('disconnected', 'Disconnected');
+    if (RFB.state == 'failed') {
+        RFB.updateState('disconnected');
+    } else {
+        RFB.updateState('disconnected', 'Disconnected');
+    }
     console.log("<< disconnect");
 }