Index: Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs
===================================================================
diff -u -r46c27a2ee2b660fc5d1228718279338aa5dfa2f5 -r989e56f1c401b0880b97d98fb1f76370d137f7d3
--- Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision 46c27a2ee2b660fc5d1228718279338aa5dfa2f5)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision 989e56f1c401b0880b97d98fb1f76370d137f7d3)
@@ -74,6 +74,13 @@
             }
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            controller.Dispose();
+
+            base.Dispose(disposing);
+        }
+
         # region Logic for preventing expand/collapse on double click
 
         protected override void DefWndProc(ref Message m)