diff --git a/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
index 20dfe67d5..a8b6a3e0e 100644
--- a/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
+++ b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
@@ -114,6 +114,7 @@ namespace mRemoteNG.UI.Controls
         {
             UnregisterModelUpdateHandlers();
             SetObjects(ConnectionTreeModel.RootNodes);
+            ResizeColumns();
             RegisterModelUpdateHandlers();
             NodeSearcher = new NodeSearcher(ConnectionTreeModel);
             ExecutePostSetupActions();
@@ -136,6 +137,7 @@ namespace mRemoteNG.UI.Controls
         private void OnPuttySessionsCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
             RefreshObjects(GetRootPuttyNodes().ToList());
+            ResizeColumns();
         }
 
         private void HandleCollectionPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs)
@@ -146,6 +148,7 @@ namespace mRemoteNG.UI.Controls
             var senderAsConnectionInfo = sender as ConnectionInfo;
             if (senderAsConnectionInfo != null)
                 RefreshObject(senderAsConnectionInfo);
+            ResizeColumns();
         }
 
         private void ExecutePostSetupActions()
@@ -240,6 +243,7 @@ namespace mRemoteNG.UI.Controls
         private void HandleCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
             RefreshObject(sender);
+            ResizeColumns();
         }
 
         private void tvConnections_AfterSelect(object sender, EventArgs e)
@@ -286,6 +290,12 @@ namespace mRemoteNG.UI.Controls
                 Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_MouseMove (UI.Window.ConnectionTreeWindow) failed", ex);
             }
         }
+
+        private void ResizeColumns()
+        {
+            foreach (OLVColumn column in Columns)
+                column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs b/mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
index 8903f1839..5d6c0d6a4 100644
--- a/mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
+++ b/mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
@@ -1,7 +1,6 @@
 using BrightIdeasSoftware;
 using mRemoteNG.Connection;
 
-
 namespace mRemoteNG.UI.Controls
 {
     public class NameColumn : OLVColumn
@@ -9,8 +8,6 @@ namespace mRemoteNG.UI.Controls
         public NameColumn(ImageGetterDelegate imageGetterDelegate)
         {
             AspectName = "Name";
-            FillsFreeSpace = true;
-            IsButton = true;
             AspectGetter = item => ((ConnectionInfo) item).Name;
             ImageGetter = imageGetterDelegate;
         }