diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceBundleKeyReference.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceBundleKeyReference.java
index 86f3bae08d62..f134448147d2 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceBundleKeyReference.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceBundleKeyReference.java
@@ -6,11 +6,8 @@ import com.intellij.lang.properties.PropertiesUtilBase;
 import com.intellij.lang.properties.ResourceBundleManager;
 import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPlainTextFile;
 import com.intellij.util.IncorrectOperationException;
@@ -29,13 +26,7 @@ public final class ResourceBundleKeyReference extends ReferenceInForm {
 
   @Override
   public PsiElement resolve() {
-    final Project project = myFile.getProject();
-    final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
-    final VirtualFile formVirtualFile = myFile.getVirtualFile();
-    if (formVirtualFile == null) {
-      return null;
-    }
-    final Module module = fileIndex.getModuleForFile(formVirtualFile);
+    final Module module = ModuleUtilCore.findModuleForFile(myFile);
     if (module == null) {
       return null;
     }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceFileReference.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceFileReference.java
index c1483ec0e412..7c5130aab6b5 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceFileReference.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceFileReference.java
@@ -3,15 +3,12 @@
 package com.intellij.uiDesigner.binding;
 
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.module.ResourceFileUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiPlainTextFile;
 import com.intellij.uiDesigner.FormEditingUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -29,13 +26,7 @@ public class ResourceFileReference extends ReferenceInForm {
   @Override
   @Nullable
   public PsiElement resolve() {
-    final Project project = myFile.getProject();
-    final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
-    final VirtualFile formVirtualFile = myFile.getVirtualFile();
-    if (formVirtualFile == null) {
-      return null;
-    }
-    final Module module = fileIndex.getModuleForFile(formVirtualFile);
+    final Module module = ModuleUtilCore.findModuleForFile(myFile);
     if (module == null) {
       return null;
     }
@@ -43,7 +34,7 @@ public class ResourceFileReference extends ReferenceInForm {
     if (formFile == null) {
       return null;
     }
-    return PsiManager.getInstance(project).findFile(formFile);
+    return myFile.getManager().findFile(formFile);
   }
 
   @Override