diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java b/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.kt
similarity index 51%
rename from idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.kt
index 3bf278294f9..1db283890bc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea;
+package org.jetbrains.kotlin.idea
 
-import com.intellij.codeInsight.navigation.GotoTargetHandler;
-import com.intellij.codeInsight.navigation.GotoTargetRendererProvider;
-import com.intellij.ide.util.PsiElementListCellRenderer;
-import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.classes.KtLightClass;
-import org.jetbrains.kotlin.idea.presentation.KtLightClassListCellRenderer;
+import com.intellij.codeInsight.navigation.GotoTargetHandler
+import com.intellij.codeInsight.navigation.GotoTargetRendererProvider
+import com.intellij.ide.util.PsiElementListCellRenderer
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.idea.presentation.KtLightClassListCellRenderer
 
-public class KotlinGotoTargetRenderProvider implements GotoTargetRendererProvider {
-    @Nullable
-    @Override
-    public PsiElementListCellRenderer getRenderer(PsiElement element, GotoTargetHandler.GotoData gotoData) {
-        if (element instanceof KtLightClass) {
-            // Need to override default Java render
-            return new KtLightClassListCellRenderer();
+class KotlinGotoTargetRenderProvider : GotoTargetRendererProvider {
+    override fun getRenderer(element: PsiElement, gotoData: GotoTargetHandler.GotoData): PsiElementListCellRenderer<*>? {
+        return when (element) {
+            is KtLightClass -> {
+                // Need to override default Java render
+                KtLightClassListCellRenderer()
+            }
+            else -> {
+                null
+            }
         }
-
-        return null;
     }
 }