diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index dffc59ae845..3e33fa77043 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1260,7 +1260,7 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
     }
     __EXCEPT(UnhandledExceptionFilter)
     {
-        TerminateThread( GetCurrentThread(), GetExceptionCode() );
+        TerminateProcess( GetCurrentProcess(), GetExceptionCode() );
     }
     __ENDTRY
     abort();  /* should not be reached */
diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c
index 361513e4e31..3f73f2ee4d8 100644
--- a/dlls/kernel32/tests/debugger.c
+++ b/dlls/kernel32/tests/debugger.c
@@ -185,6 +185,8 @@ static void doCrash(int argc,  char** argv)
     SetErrorMode( 0 );
     SetUnhandledExceptionFilter( NULL );
 
+    run_background_thread();
+
     if (argc >= 4)
     {
         crash_blackbox_t blackbox;