diff --git a/platform/lang-impl/src/com/intellij/find/actions/SearchTargetVariantsDataRule.kt b/platform/lang-impl/src/com/intellij/find/actions/SearchTargetVariantsDataRule.kt
index 0619f707eb30..b513f3ea0f7c 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/SearchTargetVariantsDataRule.kt
+++ b/platform/lang-impl/src/com/intellij/find/actions/SearchTargetVariantsDataRule.kt
@@ -38,11 +38,13 @@ class SearchTargetVariantsDataRule : GetDataRule {
     }
     else if (usageTargets.isNotEmpty()) {
       val target: UsageTarget = usageTargets[0]
-      allTargets += if (target is PsiElement2UsageTargetAdapter) {
-        PsiTargetVariant(target.element)
+      if (target is PsiElement2UsageTargetAdapter) {
+        target.element?.let {
+          allTargets += PsiTargetVariant(it)
+        }
       }
       else {
-        CustomTargetVariant(target)
+        allTargets += CustomTargetVariant(target)
       }
     }