diff --git a/mRemoteV1/Tree/PreviouslyOpenedFolderExpander.cs b/mRemoteV1/Tree/PreviouslyOpenedFolderExpander.cs
index b276da702..1c52d7165 100644
--- a/mRemoteV1/Tree/PreviouslyOpenedFolderExpander.cs
+++ b/mRemoteV1/Tree/PreviouslyOpenedFolderExpander.cs
@@ -7,7 +7,7 @@ namespace mRemoteNG.Tree
 {
     public class PreviouslyOpenedFolderExpander : IConnectionTreeDelegate
     {
-        public void Execute(ConnectionTree connectionTree)
+        public void Execute(IConnectionTree connectionTree)
         {
             var containerList = connectionTree.ConnectionTreeModel.GetRecursiveChildList(connectionTree.GetRootConnectionNode()).OfType<ContainerInfo>();
             var previouslyExpandedNodes = containerList.Where(container => container.IsExpanded);
diff --git a/mRemoteV1/Tree/RootNodeExpander.cs b/mRemoteV1/Tree/RootNodeExpander.cs
index a092ebbdf..bc02f0ae8 100644
--- a/mRemoteV1/Tree/RootNodeExpander.cs
+++ b/mRemoteV1/Tree/RootNodeExpander.cs
@@ -5,7 +5,7 @@ namespace mRemoteNG.Tree
 {
     public class RootNodeExpander : IConnectionTreeDelegate
     {
-        public void Execute(ConnectionTree connectionTree)
+        public void Execute(IConnectionTree connectionTree)
         {
             var rootConnectionNode = connectionTree.GetRootConnectionNode();
             connectionTree.InvokeExpand(rootConnectionNode);
diff --git a/mRemoteV1/UI/Controls/ConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree.cs
index 01ca2a5f9..41b3d0cf5 100644
--- a/mRemoteV1/UI/Controls/ConnectionTree.cs
+++ b/mRemoteV1/UI/Controls/ConnectionTree.cs
@@ -14,7 +14,7 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.UI.Controls
 {
-    public partial class ConnectionTree : TreeListView
+    public partial class ConnectionTree : TreeListView, IConnectionTree
     {
         private ConnectionTreeModel _connectionTreeModel;
         private readonly ConnectionTreeDragAndDropHandler _dragAndDropHandler = new ConnectionTreeDragAndDropHandler();
@@ -32,7 +32,6 @@ namespace mRemoteNG.UI.Controls
 
         public TreeNodeSingleClickHandler SingleClickHandler { get; set; } = new TreeNodeSingleClickHandler();
 
-
         public ConnectionTreeModel ConnectionTreeModel
         {
             get { return _connectionTreeModel; }
@@ -159,6 +158,16 @@ namespace mRemoteNG.UI.Controls
             return (RootNodeInfo)Roots.Cast<ConnectionInfo>().First(item => item is RootNodeInfo);
         }
 
+        void IConnectionTree.InvokeExpand(object model)
+        {
+            this.InvokeExpand(model);
+        }
+
+        void IConnectionTree.InvokeRebuildAll(bool preserveState)
+        {
+            this.InvokeRebuildAll(preserveState);
+        }
+
         public IEnumerable<RootPuttySessionsNodeInfo> GetRootPuttyNodes()
         {
             return Objects.OfType<RootPuttySessionsNodeInfo>();
diff --git a/mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs b/mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs
index 07b1b73e6..77643a1e5 100644
--- a/mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs
+++ b/mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs
@@ -3,6 +3,6 @@ namespace mRemoteNG.UI.Controls
 {
     public interface IConnectionTreeDelegate
     {
-        void Execute(ConnectionTree connectionTree);
+        void Execute(IConnectionTree connectionTree);
     }
 }
\ No newline at end of file