diff --git a/mRemoteV1/Config/Connections/XmlConnectionsDeserializer.cs b/mRemoteV1/Config/Connections/XmlConnectionsDeserializer.cs
index e9a910b8a..078dfd399 100644
--- a/mRemoteV1/Config/Connections/XmlConnectionsDeserializer.cs
+++ b/mRemoteV1/Config/Connections/XmlConnectionsDeserializer.cs
@@ -85,7 +85,6 @@ namespace mRemoteNG.Config.Connections
                 if (!import)
                     Runtime.IsConnectionsFileLoaded = false;
 
-                // SECTION 2. Initialize the treeview control.
                 var rootInfo = InitializeRootNode();
                 var connectionTreeModel = new ConnectionTreeModel();
                 connectionTreeModel.AddRootNode(rootInfo);
@@ -107,22 +106,10 @@ namespace mRemoteNG.Config.Connections
                     return null;
                 }
 
-                //if (!IsExportFile())
-                //{
-                //    RootTreeNode.ImageIndex = (int)TreeImageType.Root;
-                //    RootTreeNode.SelectedImageIndex = (int)TreeImageType.Root;
-                //}
-
-                // SECTION 3. Populate the TreeView with the DOM nodes.
-                //PopulateTreeview();
                 AddNodesFromXmlRecursive(_xmlDocument.DocumentElement, rootInfo);
-                //RootTreeNode.EnsureVisible();
                 //Windows.treeForm.InitialRefresh();
                 //SetSelectedNode(RootTreeNode);
 
-                //open connections from last mremote session
-                //OpenConnectionsFromLastSession();
-                
                 if (!import)
                     Runtime.IsConnectionsFileLoaded = true;
 
@@ -490,15 +477,5 @@ namespace mRemoteNG.Config.Connections
             }
             Windows.treeForm.tvConnections.SelectedNode = treeNode;
         }
-
-        private void OpenConnectionsFromLastSession()
-        {
-            if (!mRemoteNG.Settings.Default.OpenConsFromLastSession || mRemoteNG.Settings.Default.NoReconnect) return;
-            foreach (ConnectionInfo conI in ConnectionList)
-            {
-                if (conI.PleaseConnect)
-                    Runtime.OpenConnection(conI);
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index aed7faf13..c93bccb99 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -153,7 +153,6 @@ namespace mRemoteNG.UI.Forms
 
             Windows.treePanel.Focus();
             ConnectionTree.TreeView = Windows.treeForm.tvConnections;
-            Windows.treeForm.ExpandPreviouslyOpenedFolders();
 
             Config.Putty.Sessions.StartWatcher();
 			if (Settings.Default.StartupComponentsCheck)
@@ -167,7 +166,11 @@ namespace mRemoteNG.UI.Forms
 			AddSysMenuItems();
 			Microsoft.Win32.SystemEvents.DisplaySettingsChanged += DisplayChanged;
             Opacity = 1;
-		}
+
+            Windows.treeForm.ExpandPreviouslyOpenedFolders();
+            Windows.treeForm.EnsureRootNodeVisible();
+            Windows.treeForm.OpenConnectionsFromLastSession();
+        }
 
         private void ApplySpecialSettingsForPortableVersion()
         {
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
index 8f0f20208..cbc02930c 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
@@ -94,10 +94,12 @@ namespace mRemoteNG.UI.Window
 			DockPnl = panel;
 			InitializeComponent();
 			FillImageList();
-					
-			DescriptionTooltip = new ToolTip();
-			DescriptionTooltip.InitialDelay = 300;
-			DescriptionTooltip.ReshowDelay = 0;
+
+		    DescriptionTooltip = new ToolTip
+		    {
+		        InitialDelay = 300,
+		        ReshowDelay = 0
+		    };
 		}
 				
 		public void InitialRefresh()
@@ -113,6 +115,22 @@ namespace mRemoteNG.UI.Window
                     contI.TreeNode.Expand();
             }
         }
+
+        public void OpenConnectionsFromLastSession()
+        {
+            if (!Settings.Default.OpenConsFromLastSession || Settings.Default.NoReconnect) return;
+            foreach (ConnectionInfo conI in Runtime.ConnectionList)
+            {
+                if (conI.PleaseConnect)
+                    Runtime.OpenConnection(conI);
+            }
+        }
+
+	    public void EnsureRootNodeVisible()
+	    {
+	        var rootNode = tvConnections.Nodes[0];
+            rootNode.EnsureVisible();
+	    }
         #endregion
 
         #region Public Properties