diff --git a/uppsrc/CtrlLib/Bar.cpp b/uppsrc/CtrlLib/Bar.cpp
index 1250c8c5a..05d6cf9b1 100644
--- a/uppsrc/CtrlLib/Bar.cpp
+++ b/uppsrc/CtrlLib/Bar.cpp
@@ -533,6 +533,8 @@ void BarCtrl::Separator()
 void BarCtrl::AddCtrl(Ctrl *ctrl, Size sz)
 {
 	SizeCtrl& m = sizer.DoIndex(zii++);
+	while(m.GetFirstChild())
+		m.RemoveChild(m.GetFirstChild());
 	LogPos p = ctrl->GetPos();
 	if(p.x.IsEmpty()) {
 		if(sz.cx == INT_MAX)
diff --git a/uppsrc/CtrlLib/ToolBar.cpp b/uppsrc/CtrlLib/ToolBar.cpp
index 3e1852492..f5936933f 100644
--- a/uppsrc/CtrlLib/ToolBar.cpp
+++ b/uppsrc/CtrlLib/ToolBar.cpp
@@ -54,7 +54,7 @@ void ToolBar::Paint(Draw& w)
 
 Bar::Item& ToolBar::AddItem(Event<> cb)
 {
-	ToolButton& m = item.DoIndex(ii++);
+	ToolButton& m = item.At(ii++);
 	m.ResetKeepStyle();
 	m.WhenAction = cb;
 	m.MinSize(IsNull(buttonminsize) ? style->buttonminsize : buttonminsize);