diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
index 99dc87a91a..5142df15ac 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
+++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
@@ -41,6 +41,10 @@ static BOOL CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
 			CString sMessage = g_sMessage;
 			sMessage.Replace( "\n", "\r\n" );
 			SetWindowText( GetDlgItem(hWnd, IDC_MESSAGE), sMessage );
+			
+			// Focus is on any of the controls in the dialog by default.
+			// I'm not sure why.  Set focus to the button manually. -Chris
+			SetFocus( GetDlgItem(hWnd, IDOK) );
 		}
 		break;
 	case WM_DESTROY: