diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
index a3842e088b2c..892bade71c04 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.codeInsight.editorActions;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
@@ -68,7 +68,7 @@ public class BlockJoinLinesHandler implements JoinLinesHandlerDelegate {
   }
 
   private static int getForceBraceSetting(PsiElement statement) {
-    CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(statement.getProject());
+    CodeStyleSettings settings = CodeStyle.getSettings(statement.getContainingFile());
     final CommonCodeStyleSettings codeStyleSettings = settings.getCommonSettings(JavaLanguage.INSTANCE);
     if (statement instanceof PsiIfStatement) {
       return codeStyleSettings.IF_BRACE_FORCE;