diff --git a/uppsrc/CtrlLib/Bar.cpp b/uppsrc/CtrlLib/Bar.cpp
index 0e9a49e4e..5af96413c 100644
--- a/uppsrc/CtrlLib/Bar.cpp
+++ b/uppsrc/CtrlLib/Bar.cpp
@@ -471,7 +471,7 @@ bool BarCtrl::IsEmpty() const
 
 void BarCtrl::Separator()
 {
-	AddNC(separator.DoIndex(sii++).Margin(lsepm, rsepm).SetStyle(*sepstyle).SetSize(ssize));
+	AddNC(separator.At(sii++).Margin(lsepm, rsepm).SetStyle(*sepstyle).SetSize(ssize));
 }
 
 void BarCtrl::AddCtrl(Ctrl *ctrl, Size sz)
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index e47701974..db6f0dc6a 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -200,7 +200,9 @@ void Ide::Edit(Bar& menu) {
 	}
 
 	menu.MenuSeparator();
-	menu.Add("Find and Replace", THISBACK(SearchMenu));
+	
+	if(menu.IsMenuBar())
+		menu.Add("Find and Replace", THISBACK(SearchMenu));
 
 	if(!designer && menu.IsMenuBar()) {
 		menu.Add("Insert", THISBACK(InsertMenu));