diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index b9816cd918d7..7b7dbdf469a8 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -1376,7 +1376,7 @@ public abstract class DialogWrapper {
     if (!postponeValidation()) {
       startTrackingValidation();
     }
-    if (SystemInfo.isWindows) {
+    if (SystemInfo.isWindows || (SystemInfo.isLinux && Registry.is("ide.linux.enter.on.dialog.triggers.focused.button"))) {
       installEnterHook(root, myDisposable);
     }
     myErrorTextAlarm.setActivationComponent(root);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index df577ab710c5..1d491c69bc7d 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1612,6 +1612,9 @@ batch.jvm.inspections.description=Enables common batch inspections for Java and
 ide.project.view.change.icon.on.selection=false
 ide.project.view.change.icon.on.selection.description=Use Darcula icons when tree element is focused and selected
 
+ide.linux.enter.on.dialog.triggers.focused.button=true
+ide.linux.enter.on.dialog.triggers.focused.button.description=IDEA-125537 Pushing Enter in dialog windows chooses default focus instead of manually selected one on Linux
+
 ide.tree.large.model.allowed=false
 ide.tree.large.model.allowed.description=Allows to use FixedHeightLayoutCache if setLargeModel(true)