1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchView.cs
index eee1df7af6..6827a7ae10 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchView.cs
@@ -126,8 +126,8 @@ namespace MonoDevelop.Debugger.VSTextView.PinnedWatches
 
 			var origin = textView.ConvertPointFromView (Frame.Location, this);
 			var maxHeight = NMath.Max (textView.Frame.Bottom - origin.Y, treeView.RowHeight * 2);
-			var height = treeView.FittingSize.Height;
-			var width = treeView.Frame.Width;
+			var height = (treeView.RowHeight + treeView.IntercellSpacing.Height) * treeView.RowCount;
+			var width = treeView.OptimalTooltipWidth;
 
 			height = NMath.Min (height, maxHeight);