diff --git a/uppsrc/CtrlLib/DisplayPopup.h b/uppsrc/CtrlLib/DisplayPopup.h
index b3a1045c2..f8ae9fa94 100644
--- a/uppsrc/CtrlLib/DisplayPopup.h
+++ b/uppsrc/CtrlLib/DisplayPopup.h
@@ -1,4 +1,3 @@
-
 class DisplayPopup : public Ctrl, public Link<DisplayPopup> {
 	virtual void  Paint(Draw& w);
 	virtual void  LeftDown(Point p, dword);
diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp
index 0645c548e..b7e50ca66 100644
--- a/uppsrc/CtrlLib/TreeCtrl.cpp
+++ b/uppsrc/CtrlLib/TreeCtrl.cpp
@@ -878,7 +878,7 @@ void TreeCtrl::SyncInfo()
 			Size csz = m.GetCtrlSize();
 			if(m.ctrl && !highlight_ctrl)
 				x += csz.cx;
-			Rect r = RectC(x, l.y - org.y, sz.cx - x, m.GetSize(display).cy);
+			Rect r = RectC(x, l.y - org.y, sz.cx - x, m.GetValueSize(display).cy + 2 * m.margin);
 			if(r.Contains(p)) {
 				Color fg, bg;
 				dword st;