diff --git a/uppsrc/ide/Annotations.cpp b/uppsrc/ide/Annotations.cpp
index a3e37fa6b..bf2e70476 100644
--- a/uppsrc/ide/Annotations.cpp
+++ b/uppsrc/ide/Annotations.cpp
@@ -177,7 +177,7 @@ void AssistEditor::NewTopic(String group, String coderef)
 		theide->EditFile(ef);
 }
 
-void AssistEditor::EditAnnotation(bool fastedit)
+void AssistEditor::EditAnnotation(bool leftclick)
 {
 	if(!SyncRefsFinished)
 		return;
@@ -210,7 +210,7 @@ void AssistEditor::EditAnnotation(bool fastedit)
 				String scope2, item2;
 				SplitCodeRef(coderef2, scope2, item2);
 				m = GetCodeRefItem(coderef2);
-				if(scope2 == scope && m && m->access == access && tl.GetCount() == 1 && fastedit) {
+				if(scope2 == scope && m && m->access == access && tl.GetCount() == 1 && leftclick) {
 					OpenTopic(tl[0] + '#' + coderef2, coderef, false);
 					return;
 				}
diff --git a/uppsrc/ide/Help.cpp b/uppsrc/ide/Help.cpp
index 802a283b1..840ba6b33 100644
--- a/uppsrc/ide/Help.cpp
+++ b/uppsrc/ide/Help.cpp
@@ -560,6 +560,8 @@ void Ide::ShowTopicsWin()
 	if(windoc.IsOpen())
 		windoc.SetForeground();
 	else {
+		topic_serial++;
+		GetRefLinks("");
 		windoc.SyncDocTree();
 		windoc.GoTo(sTopicHome);
 		windoc.OpenMain();
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 1a5543840..49afdf65d 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -795,7 +795,7 @@ void Ide::HelpMenu(Bar& menu)
 {
 	if(!IsEditorMode()) {
 		menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
-		menu.Add(AK_SEARCHTOPICS, THISBACK(SearchTopics));
+		menu.Add(editor.GetWord().GetCount(), AK_SEARCHTOPICS, THISBACK(SearchTopics));
 	}
 	menu.Add(AK_BROWSETOPICS_WIN, IdeImg::help_win(), THISBACK(ShowTopicsWin));
 	menu.MenuSeparator();