diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
index 19830505a86..0b63ce06cda 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -90,19 +90,21 @@ class KotlinLineMarkerProvider : LineMarkerProvider {
                     }
                 }
             }
-
-            if (element is KtNamedDeclaration) {
-                if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
-                    collectImplementationMarkers(element, result)
-                }
-                else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
-                    collectHeaderMarkers(element, result)
-                }
-            }
         }
 
         collectOverriddenFunctions(functions, result)
         collectOverriddenPropertyAccessors(properties, result)
+
+        for (element in elements) {
+            if (element !is KtNamedDeclaration) continue
+
+            if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
+                collectImplementationMarkers(element, result)
+            }
+            else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
+                collectHeaderMarkers(element, result)
+            }
+        }
     }
 }