diff --git a/src/servers/debug/DebugWindow.cpp b/src/servers/debug/DebugWindow.cpp
index ed369a04f6..a35c351d8c 100644
--- a/src/servers/debug/DebugWindow.cpp
+++ b/src/servers/debug/DebugWindow.cpp
@@ -73,6 +73,7 @@ DebugWindow::DebugWindow(const char* appName)
 
 	fOKButton = new BButton("close", B_TRANSLATE("Oh no!"),
 		new BMessage(B_QUIT_REQUESTED));
+	fOKButton->MakeDefault(true);
 
 	terminate->SetValue(B_CONTROL_ON);