diff --git a/app/ui.js b/app/ui.js
index e39b3f08..5fc1ce45 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1048,8 +1048,6 @@ var UI = {
 
         UI.updateVisualState('disconnecting');
 
-        UI.rfb = undefined;
-
         // Don't display the connection settings until we're actually disconnected
     },
 
@@ -1102,6 +1100,8 @@ var UI = {
         // UI.disconnect() won't be used in those cases.
         UI.connected = false;
 
+        UI.rfb = undefined;
+
         if (!e.detail.clean) {
             UI.updateVisualState('disconnected');
             if (wasConnected) {