diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java
index 45d3619b7ce7..3df47cd3ca32 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java
@@ -4,6 +4,7 @@ package com.intellij.codeInsight.actions;
 import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.lang.LanguageImportStatements;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.NlsContexts;
@@ -91,7 +92,7 @@ public final class LayoutCodeDialog extends DialogWrapper {
   }
 
   private void setUpActions() {
-    boolean canOptimizeImports = !OptimizeImportsProcessor.collectOptimizers(myFile).isEmpty();
+    boolean canOptimizeImports = !LanguageImportStatements.INSTANCE.forFile(myFile).isEmpty();
     myOptimizeImportsCb.setVisible(canOptimizeImports);
     if (canOptimizeImports) {
       myOptimizeImportsCb.setSelected(myLastRunOptions.getLastOptimizeImports());
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
index 48791780791d..5fea33879d45 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
@@ -215,7 +215,7 @@ public final class OptimizeImportsAction extends AnAction {
   }
 
   private static boolean isOptimizeImportsAvailable(@NotNull PsiFile file) {
-    return !OptimizeImportsProcessor.collectOptimizers(file).isEmpty();
+    return !LanguageImportStatements.INSTANCE.forFile(file).isEmpty();
   }
 
   private static Boolean isProcessVcsChangedText(Project project, @NlsContexts.Label String text, boolean hasChanges) {