diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java
new file mode 100644
index 000000000000..adbf48df086b
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.codeStyle.autodetect;
+
+import com.intellij.ide.highlighter.JavaFileType;
+import com.intellij.lang.java.JavaLanguage;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+
+public class DetectIndentAndTypeTest extends LightPlatformCodeInsightFixtureTestCase {
+
+  private CodeStyleSettings mySettings;
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    CodeStyleSettingsManager.getInstance(getProject()).setTemporarySettings(new CodeStyleSettings());
+    mySettings = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings();
+    mySettings.AUTODETECT_INDENTS = true;
+    DetectableIndentOptionsProvider optionsProvider = DetectableIndentOptionsProvider.getInstance();
+    if (optionsProvider != null) {
+      optionsProvider.setEnabledInTest(true);
+    }
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
+    DetectableIndentOptionsProvider optionsProvider = DetectableIndentOptionsProvider.getInstance();
+    if (optionsProvider != null) {
+      optionsProvider.setEnabledInTest(false);
+    }
+    super.tearDown();
+  }
+
+  public void testWhenTabsDetected_SetIndentSizeToTabSize() {
+    CommonCodeStyleSettings common = mySettings.getCommonSettings(JavaLanguage.INSTANCE);
+    CommonCodeStyleSettings.IndentOptions indentOptions = common.getIndentOptions();
+
+    assert indentOptions != null;
+
+    indentOptions.INDENT_SIZE = 1;
+    indentOptions.TAB_SIZE = 2;
+
+    myFixture.configureByText(JavaFileType.INSTANCE,
+                              "public class T {\n" +
+                              "\tvoid run() {\n" +
+                              "\t\tint a = 2;<caret>\n" +
+                              "\t}\n" +
+                              "}\n");
+    myFixture.type('\n');
+    myFixture.checkResult("public class T {\n" +
+                          "\tvoid run() {\n" +
+                          "\t\tint a = 2;\n" +
+                          "\t\t<caret>\n" +
+                          "\t}\n" +
+                          "}\n");
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentOptionsDetectorImpl.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentOptionsDetectorImpl.java
index a0ed4174e22d..4c425a8e4d24 100644
--- a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentOptionsDetectorImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentOptionsDetectorImpl.java
@@ -81,6 +81,7 @@ public class IndentOptionsDetectorImpl implements IndentOptionsDetector {
 
     if (linesWithTabs > linesWithWhiteSpaceIndent) {
       setUseTabs(indentOptions, true);
+      indentOptions.INDENT_SIZE = indentOptions.TAB_SIZE;
     }
     else if (linesWithWhiteSpaceIndent > linesWithTabs) {
       setUseTabs(indentOptions, false);