diff --git a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp
index 003d02892c..40d37e691f 100644
--- a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp
@@ -749,10 +749,14 @@ bool CrashDialog::HandleMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 
 			SAFE_DELETE( m_pPost );
 
+			/* On error, don't show the "report" button again.  If the submission was actually
+			 * successful, then it'd be too easy to accidentally spam the server by holding
+			 * down the button. */
 			if( !sError.empty() )
 			{
-				SetDialogInitial();
 				SetWindowText( GetDlgItem(hDlg, IDC_MAIN_TEXT), ERROR_SENDING_REPORT.GetValue() );
+				SetWindowText( GetDlgItem(hDlg, IDC_BUTTON_CLOSE), CLOSE.GetValue() );
+				ShowWindow( GetDlgItem(hDlg, IDC_PROGRESS), false );
 				break;
 			}