diff --git a/RedPandaIDE/widgets/codecompletionpopup.cpp b/RedPandaIDE/widgets/codecompletionpopup.cpp
index ef440f38..b1cd2199 100644
--- a/RedPandaIDE/widgets/codecompletionpopup.cpp
+++ b/RedPandaIDE/widgets/codecompletionpopup.cpp
@@ -971,13 +971,14 @@ void CodeCompletionPopup::hideEvent(QHideEvent *event)
     QMutexLocker locker(&mMutex);
     mListView->setKeypressedCallback(nullptr);
     mCompletionStatementList.clear();
-    foreach (PStatement statement, mFullCompletionStatementList) {
-        statement->matchPositions.clear();
-    }
+//    foreach (PStatement statement, mFullCompletionStatementList) {
+//        statement->matchPositions.clear();
+//    }
     mFullCompletionStatementList.clear();
     mIncludedFiles.clear();
     mUsings.clear();
     mAddedStatements.clear();
+    mCurrentStatement = nullptr;
     mParser = nullptr;
     QWidget::hideEvent(event);
 }