diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 5bde579b0..f12b9a621 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -121,6 +121,7 @@ void AssistEditor::CloseAssist()
 		popup.Close();
 	if(annotation_popup.IsOpen())
 		annotation_popup.Close();
+	assist_item_ndx.Clear();
 	assist_item.Clear();
 	CloseTip();
 }
diff --git a/uppsrc/ide/AssistDisplay.cpp b/uppsrc/ide/AssistDisplay.cpp
index 6bf1a92aa..38efcd22b 100644
--- a/uppsrc/ide/AssistDisplay.cpp
+++ b/uppsrc/ide/AssistDisplay.cpp
@@ -149,7 +149,7 @@ String CppText(const String& name, const String& pretty)
 void AssistEditor::AssistDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
 {
 	int ii = q;
-	if(ii >= 0 && ii < editor->assist_item_ndx.GetCount()) {
+	if(ii >= 0 && ii < editor->assist_item_ndx.GetCount() && editor->assist_item_ndx[ii] < editor->assist_item.GetCount()) {
 		AutoCompleteItem& m = editor->assist_item[editor->assist_item_ndx[ii]];
 
 		w.DrawRect(r, paper);