diff --git a/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs b/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs
index 557fa0940..dba9e2141 100644
--- a/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs
+++ b/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs
@@ -316,6 +316,7 @@
             this.MaximizeBox = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Remote Host Manager";
+            this.Load += new System.EventHandler(this.RemoteManager_Load);
             tableLayoutPanel1.ResumeLayout(false);
             basicConfigBox.ResumeLayout(false);
             basicConfigBox.PerformLayout();
diff --git a/renderdocui/Windows/Dialogs/RemoteManager.cs b/renderdocui/Windows/Dialogs/RemoteManager.cs
index cc8b40b60..2325b21dc 100644
--- a/renderdocui/Windows/Dialogs/RemoteManager.cs
+++ b/renderdocui/Windows/Dialogs/RemoteManager.cs
@@ -114,7 +114,10 @@ namespace renderdocui.Windows.Dialogs
 
             m_Core = core;
             m_Main = main;
+        }
 
+        private void RemoteManager_Load(object sender, EventArgs e)
+        {
             hosts.BeginInit();
 
             foreach (var h in m_Core.Config.RemoteHosts)