diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
index 7d053fadc0..577c6f54c6 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
@@ -1,7 +1,7 @@
 /** @file
   Multi-Processor support functions implementation.
 
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -108,6 +108,11 @@ HaltOtherProcessors (
 
   mDebugMpContext.BreakAtCpuIndex = CurrentProcessorIndex;
 
+  //
+  // Set the debug viewpoint to the current breaking CPU.
+  //
+  SetDebugViewPoint (CurrentProcessorIndex);
+
   //
   // Send fixed IPI to other processors.
   //