diff --git a/mRemoteV1/Tree/ConnectionTree.cs b/mRemoteV1/Tree/ConnectionTree.cs
index dae1ae7f..f827fa01 100644
--- a/mRemoteV1/Tree/ConnectionTree.cs
+++ b/mRemoteV1/Tree/ConnectionTree.cs
@@ -117,12 +117,25 @@ namespace mRemoteNG.Tree
         }
 
         public static void FinishRenameSelectedNode(string newName)
+        {
+            FinishRenameSelectedConnectionNode(newName);
+            FinishRenameSelectedContainerNode(newName);
+        }
+
+        private static void FinishRenameSelectedConnectionNode(string newName)
         {
             ConnectionInfo connectionInfo = SelectedNode.Tag as ConnectionInfo;
             if (connectionInfo != null)
                 ConnectionTreeNode.RenameNode(connectionInfo, newName);
         }
 
+        private static void FinishRenameSelectedContainerNode(string newName)
+        {
+            Container.ContainerInfo containerInfo = SelectedNode.Tag as Container.ContainerInfo;
+            if (containerInfo != null)
+                ConnectionTreeNode.RenameNode(containerInfo.ConnectionInfo, newName);
+        }
+
         public static void SetNodeToolTip(MouseEventArgs e, ToolTip tTip)
         {
             try