diff --git a/mRemoteV1/Connection/ConnectionInitiator.cs b/mRemoteV1/Connection/ConnectionInitiator.cs
index 487ad1d8..a1587dbc 100644
--- a/mRemoteV1/Connection/ConnectionInitiator.cs
+++ b/mRemoteV1/Connection/ConnectionInitiator.cs
@@ -15,19 +15,6 @@ namespace mRemoteNG.Connection
 {
     public static class ConnectionInitiator
     {
-        //TODO Fix for TreeListView
-        public static void OpenConnection()
-        {
-            try
-            {
-                OpenConnection(ConnectionInfo.Force.None);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
-            }
-        }
-
         //TODO Fix for TreeListView
         public static void OpenConnection(ConnectionInfo.Force Force)
         {
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
index ae3220e7..1535240d 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
@@ -272,7 +272,7 @@ namespace mRemoteNG.UI.Window
                 //if (e.Button != MouseButtons.Left) return;
                 if (clickedNode.GetTreeNodeType() != TreeNodeType.Connection && clickedNode.GetTreeNodeType() != TreeNodeType.PuttySession) return;
                 if (Settings.Default.SingleClickOnConnectionOpensIt)
-                    ConnectionInitiator.OpenConnection();
+                    ConnectionInitiator.OpenConnection(SelectedNode);
 
                 if (Settings.Default.SingleClickSwitchesToOpenConnection)
                     ConnectionInitiator.SwitchToOpenConnection(SelectedNode);
@@ -291,7 +291,7 @@ namespace mRemoteNG.UI.Window
             if (clickedNode?.GetTreeNodeType() == TreeNodeType.Connection |
                 clickedNode?.GetTreeNodeType() == TreeNodeType.PuttySession)
 			{
-                ConnectionInitiator.OpenConnection();
+                ConnectionInitiator.OpenConnection(SelectedNode);
 			}
 		}
 
@@ -838,7 +838,7 @@ namespace mRemoteNG.UI.Window
 					if (tvConnections.SelectedNode.Tag is ConnectionInfo)
 					{
 						e.Handled = true;
-                        ConnectionInitiator.OpenConnection();
+                        ConnectionInitiator.OpenConnection(SelectedNode);
 					}
 					else
 					{