diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index e46b8f99d..f1728f532 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -176,6 +176,7 @@ namespace mRemoteNG.UI.Forms
             credsAndConsSetup.LoadCredsAndCons(Runtime.ConnectionsService, Runtime.CredentialService, _saveConnectionsOnEdit);
 
             Windows.TreeForm.Focus();
+            Windows.TreeForm.ConnectionTree.ConnectionTreeModel = Runtime.ConnectionsService.ConnectionTreeModel;
 
             PuttySessionsManager.Instance.StartWatcher();
 			if (Settings.Default.StartupComponentsCheck)
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
index 415e594c3..c77b032fe 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
@@ -42,7 +42,6 @@ namespace mRemoteNG.UI.Window
 		    SetConnectionTreeEventHandlers();
 		    Settings.Default.PropertyChanged += OnAppSettingsChanged;
 		    ApplyLanguage();
-            ConnectionTree.ConnectionTreeModel = Runtime.ConnectionsService.ConnectionTreeModel;
         }
 
 	    private void OnAppSettingsChanged(object o, PropertyChangedEventArgs propertyChangedEventArgs)
@@ -169,7 +168,7 @@ namespace mRemoteNG.UI.Window
 	        }
 
             // TODO: might not need this call anymore
-	        olvConnections.SelectedObject = ConnectionTree.ConnectionTreeModel.RootNodes
+            olvConnections.SelectedObject = ConnectionTree.ConnectionTreeModel?.RootNodes
 	            .OfType<RootNodeInfo>().FirstOrDefault();
 	    }
         #endregion