Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.Designer.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -ra5294651797be8410ae92057a92f38767a37d53f
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.Designer.cs	(.../TreeViewControl.Designer.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.Designer.cs	(.../TreeViewControl.Designer.cs)	(revision a5294651797be8410ae92057a92f38767a37d53f)
@@ -28,19 +28,6 @@
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Component Designer generated code
 
         /// <summary> 
@@ -73,6 +60,6 @@
 
         #endregion
 
-        private Core.Common.Controls.Forms.DoubleBufferedTreeView treeView;
+        private Forms.DoubleBufferedTreeView treeView;
     }
 }
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -r53d0806e953dfe5bb0bce91299ae901b45c5afe2 -ra5294651797be8410ae92057a92f38767a37d53f
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 53d0806e953dfe5bb0bce91299ae901b45c5afe2)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision a5294651797be8410ae92057a92f38767a37d53f)
@@ -344,6 +344,17 @@
             return treeNode?.FullPath;
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            updateTimer.Stop();
+
+            if (disposing)
+            {
+                components?.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
         private bool CanRename(TreeNode treeNode)
         {
             TreeNodeInfo treeNodeInfo = TryGetTreeNodeInfoForData(treeNode.Tag);