diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
index d1140782b60f..3d4d2c1330f8 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
@@ -491,6 +491,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     UIDefaults lookAndFeelDefaults=UIManager.getLookAndFeelDefaults();
     initInputMapDefaults(lookAndFeelDefaults);
     initActionMapDefaults(lookAndFeelDefaults);
+    UIManager.put("Button.defaultButtonFollowsFocus", Boolean.FALSE);
     patchFileChooserStrings(lookAndFeelDefaults);
     if (shouldPatchLAFFonts()) {
       storeOriginalFontDefaults(lookAndFeelDefaults);