diff --git a/Terminal.Gui/Views/TableView/TreeTableSource.cs b/Terminal.Gui/Views/TableView/TreeTableSource.cs
index d14b1eec2..9a8b08866 100644
--- a/Terminal.Gui/Views/TableView/TreeTableSource.cs
+++ b/Terminal.Gui/Views/TableView/TreeTableSource.cs
@@ -68,6 +68,8 @@ public class TreeTableSource<T> : IEnumerableTableSource<T>, IDisposable where T
 	/// <inheritdoc/>
 	public void Dispose ()
 	{
+		_tableView.KeyPress -= Table_KeyPress;
+		_tableView.MouseClick -= Table_MouseClick;
 		_tree.Dispose ();
 	}
 
@@ -200,4 +202,4 @@ public class TreeTableSource<T> : IEnumerableTableSource<T>, IDisposable where T
 	{
 		return _tree.BuildLineMap ().Select (b => b.Model);
 	}
-}
\ No newline at end of file
+}