diff --git a/renderdocui/Windows/Dialogs/RemoteManager.cs b/renderdocui/Windows/Dialogs/RemoteManager.cs
index 43636a08f..4e17555d8 100644
--- a/renderdocui/Windows/Dialogs/RemoteManager.cs
+++ b/renderdocui/Windows/Dialogs/RemoteManager.cs
@@ -172,7 +172,11 @@ namespace renderdocui.Windows.Dialogs
 
             string username = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
 
-            (node.Tag as RemoteHost).CheckStatus();
+            RemoteHost host = node.Tag as RemoteHost;
+
+            host.CheckStatus();
+
+            SetRemoteServerLive(node, host.ServerRunning, host.Busy);
 
             StaticExports.EnumerateRemoteTargets(hostname, (UInt32 i) => {
                 try