diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp
index 64a1e3e5e6..a7cf430099 100644
--- a/src/Gui/CallTips.cpp
+++ b/src/Gui/CallTips.cpp
@@ -143,7 +143,8 @@ void CallTipsList::keyboardSearch(const QString& wordPrefix)
         }
     }
 
-    setItemSelected(currentItem(), false);
+    if (currentItem())
+        currentItem()->setSelected(false);
 }
 
 void CallTipsList::validateCursor()
diff --git a/src/Gui/TextEdit.cpp b/src/Gui/TextEdit.cpp
index 8844f08a12..f9f4cc7116 100644
--- a/src/Gui/TextEdit.cpp
+++ b/src/Gui/TextEdit.cpp
@@ -518,7 +518,8 @@ void CompletionList::findCurrentWord(const QString& wordPrefix)
         }
     }
 
-    setItemSelected(currentItem(), false);
+    if (currentItem())
+        currentItem()->setSelected(false);
 }
 
 /**