diff --git a/src/preferences/mail/AutoConfigWindow.cpp b/src/preferences/mail/AutoConfigWindow.cpp
index cf03d0ecfa..602fa0e635 100644
--- a/src/preferences/mail/AutoConfigWindow.cpp
+++ b/src/preferences/mail/AutoConfigWindow.cpp
@@ -45,6 +45,7 @@ AutoConfigWindow::AutoConfigWindow(BRect rect, BWindow *parent)
 	buttonRect.left+= 5 + buttonWidth;
 	buttonRect.right = buttonRect.left + buttonWidth;
 	fNextButton = new BButton(buttonRect, "ok", "OK", new BMessage(kOkMsg));
+	fNextButton->MakeDefault(true);
 	fRootView->AddChild(fNextButton);
 	
 	fBoxRect = Bounds();
@@ -54,6 +55,10 @@ AutoConfigWindow::AutoConfigWindow(BRect rect, BWindow *parent)
 	fMainView = new AutoConfigView(fBoxRect, fAutoConfig);
 	fMainView->SetLabel("Account settings");
 	fRootView->AddChild(fMainView);
+	
+	// Add a shortcut to close the window using Command-W
+	AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
+	
 }