diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/CustomFrameDialogContent.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/CustomFrameDialogContent.kt
index 22858a1dc134..ba86b9746576 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/CustomFrameDialogContent.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/CustomFrameDialogContent.kt
@@ -50,7 +50,9 @@ class CustomFrameDialogContent private constructor(window: Window, content: Cont
         }
 
         panel.add(header, "growx, wmin 100")
+        val oldButton = (window as RootPaneContainer).rootPane.defaultButton
         panel.add(content, "grow")
+        (window as RootPaneContainer).rootPane.defaultButton = oldButton
     }
 
     override val content: JComponent