diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 338640b8dd5..d45c0be1490 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -187,6 +187,8 @@ NTSTATUS STDCALL PiTerminateProcess(PEPROCESS Process,
    Process->Pcb.DispatcherHeader.SignalState = TRUE;
    KeDispatcherObjectWake(&Process->Pcb.DispatcherHeader);
    KeReleaseDispatcherDatabaseLock(FALSE);
+   if( PsGetCurrentThread()->ThreadsProcess == Process )
+     PsTerminateCurrentThread( ExitStatus );
    DPRINT("RC %d\n", ObGetReferenceCount(Process));
    return(STATUS_SUCCESS);
 }