diff --git a/BaseTools/ImageTool/PeEmit.c b/BaseTools/ImageTool/PeEmit.c
index d95882f0dd..ac47a9682d 100644
--- a/BaseTools/ImageTool/PeEmit.c
+++ b/BaseTools/ImageTool/PeEmit.c
@@ -336,7 +336,7 @@ ToolImageEmitPeSectionHeaders (
     Sections[Index].PointerToRawData = SectionOffset;
     Sections[Index].VirtualAddress   = SectionOffset;
     Sections[Index].SizeOfRawData    = ALIGN_VALUE (Image->SegmentInfo.Segments[Index].DataSize, Context->FileAlignment);
-    Sections[Index].VirtualSize      = Sections[Index].SizeOfRawData;
+    Sections[Index].VirtualSize      = Image->SegmentInfo.Segments[Index].ImageSize;
 
     strncpy (
       (char *) Sections[Index].Name,