diff --git a/plugins/devkit/src/dom/impl/LanguageResolvingConverter.java b/plugins/devkit/src/dom/impl/LanguageResolvingConverter.java
index da1fb7217f5f..7de64910d4b6 100644
--- a/plugins/devkit/src/dom/impl/LanguageResolvingConverter.java
+++ b/plugins/devkit/src/dom/impl/LanguageResolvingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.idea.devkit.dom.impl;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.util.Condition;
+import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xml.ConvertContext;
 import com.intellij.util.xml.ResolvingConverter;
@@ -55,6 +56,12 @@ class LanguageResolvingConverter extends ResolvingConverter<LanguageResolvingUti
     });
   }
 
+  @Nullable
+  @Override
+  public PsiElement getPsiElement(@Nullable LanguageResolvingUtil.LanguageDefinition resolvedValue) {
+    return resolvedValue != null ? resolvedValue.clazz : null;
+  }
+
   @Nullable
   @Override
   public String toString(@Nullable LanguageResolvingUtil.LanguageDefinition o, ConvertContext context) {