diff --git a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java
index 9ca8cdd2d10a..855007f8d9e2 100644
--- a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java
+++ b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java
@@ -87,18 +87,7 @@ public class ConfigureCodeStyleOnSelectedFragment implements IntentionAction, Lo
 
   @Nullable
   private static LanguageCodeStyleSettingsProvider guessSettingsProviderForLanguage(@NotNull Language language) {
-    LanguageCodeStyleSettingsProvider exactMatch = LanguageCodeStyleSettingsProvider.forLanguage(language);
-    if (exactMatch != null) {
-      return exactMatch;
-    }
-    LanguageCodeStyleSettingsProvider guessed = null;
-    for (LanguageCodeStyleSettingsProvider provider : LanguageCodeStyleSettingsProvider.EP_NAME.getExtensionList()) {
-      if (language.isKindOf(provider.getLanguage())
-          && (guessed == null || provider.getLanguage().isKindOf(guessed.getLanguage()))) {
-        guessed = provider;
-      }
-    }
-    return guessed;
+    return LanguageCodeStyleSettingsProvider.findUsingBaseLanguage(language);
   }
 
   @Override