diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/IntelliJLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/IntelliJLaf.java
index bc862f10fe5f..d022bff0ce58 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/IntelliJLaf.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/IntelliJLaf.java
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.basic.BasicLookAndFeel;
 import javax.swing.plaf.metal.DefaultMetalTheme;
 import java.awt.*;
 import java.io.File;
@@ -43,6 +44,20 @@ public class IntelliJLaf extends DarculaLaf {
     return isWindowsNativeLook() ? "intellijlaf_native" : "intellijlaf";
   }
 
+  @Override
+  protected BasicLookAndFeel createBaseLookAndFeel() {
+    if (isWindowsNativeLook()) {
+      try {
+        final String name = UIManager.getSystemLookAndFeelClassName();
+        return (BasicLookAndFeel)Class.forName(name).newInstance();
+      }
+      catch (Exception e) {
+        log(e);
+      }
+    }
+    return super.createBaseLookAndFeel();
+  }
+
   @Override
   protected DefaultMetalTheme createMetalTheme() {
     return new IdeaBlueMetalTheme();
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
index 119e862b5ec9..7677c67d0e4c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
@@ -130,13 +130,13 @@ StatusBar.topColor=2c2c2c
 StatusBar.top2Color=2c2c2c
 StatusBar.bottomColor=2c2c2c
 
-Button.border=com.intellij.ide.ui.laf.intellij.WinIntelliJButtonPainter
-ButtonUI=com.intellij.ide.ui.laf.intellij.WinIntelliJButtonUI
-Button.disabledText=999999
-Button.intellij.native.activeBorderColor=0078d7
-Button.intellij.native.borderColor=adadad
-Button.intellij.native.activeBackgroundColor=e5f1fb
-Button.background=e1e1e1
+#Button.border=com.intellij.ide.ui.laf.intellij.WinIntelliJButtonPainter
+#ButtonUI=com.intellij.ide.ui.laf.intellij.WinIntelliJButtonUI
+#Button.disabledText=999999
+#Button.intellij.native.activeBorderColor=0078d7
+#Button.intellij.native.borderColor=adadad
+#Button.intellij.native.activeBackgroundColor=e5f1fb
+#Button.background=e1e1e1
 
 ToggleButton.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter
 ToggleButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI
@@ -146,13 +146,13 @@ PopupMenu.translucentBackground=e8e8e8
 
 ToolTip.background=ffffcc
 
-SpinnerUI=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerUI
-Spinner.border=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerBorder
-Spinner.background=e8e8e8
-Spinner.arrowButtonInsets=1,1,1,1
-Spinner.editorBorderPainted=false
-Spinner.darcula.enabledButtonColor=6e9bd5
-Spinner.darcula.disabledButtonColor=e8e8e8
+#SpinnerUI=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerUI
+#Spinner.border=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerBorder
+#Spinner.background=e8e8e8
+#Spinner.arrowButtonInsets=1,1,1,1
+#Spinner.editorBorderPainted=false
+#Spinner.darcula.enabledButtonColor=6e9bd5
+#Spinner.darcula.disabledButtonColor=e8e8e8
 
 SplitPane.highlight=e8e8e8