diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
index 7d82884326..ff1d000aeb 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
@@ -1,7 +1,7 @@
 /** @file
   Implements filebuffer interface functions.
 
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2005 - 2012, 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
@@ -489,6 +489,7 @@ FileBufferPrintLine (
   CHAR16  *Buffer;
   UINTN   Limit;
   CHAR16  PrintLine[200];
+  CHAR16  PrintLine2[250];
 
   //
   // print start from correct character
@@ -506,12 +507,13 @@ FileBufferPrintLine (
   }
 
   PrintLine[MainEditor.ScreenSize.Column] = CHAR_NULL;
+  ShellCopySearchAndReplace(PrintLine, PrintLine2,  250, L"%", L"^%", FALSE, FALSE);
 
   ShellPrintEx (
     0,
     (INT32)Row - 1,
     L"%s",
-    PrintLine
+    PrintLine2
     );
 
   return EFI_SUCCESS;
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index aabd9140df..85a5d44f08 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -2720,6 +2720,11 @@ InternalShellPrintWorker(
     //
     if (ResumeLocation != NULL) {
       if (*(ResumeLocation-1) == L'^') {
+        //
+        // Move cursor back 1 position to overwrite the ^
+        //
+        gST->ConOut->SetCursorPosition(gST->ConOut, gST->ConOut->Mode->CursorColumn - 1, gST->ConOut->Mode->CursorRow);
+
         //
         // Print a simple '%' symbol
         //