diff --git a/hal/halx86/generic/x86bios.c b/hal/halx86/generic/x86bios.c
index 940ded2def0..66f4dcb5015 100644
--- a/hal/halx86/generic/x86bios.c
+++ b/hal/halx86/generic/x86bios.c
@@ -427,15 +427,17 @@ x86BiosCall(
                       NULL,  // FpuCallback,
                       NULL); // Tlb
 
-    /* Copy the registers */
+    /* Copy the GP registers */
     EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Registers->Eax;
     EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Registers->Ebx;
     EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Registers->Ecx;
     EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Registers->Edx;
     EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Registers->Esi;
     EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Registers->Edi;
-    EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector = Registers->SegDs;
-    EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector = Registers->SegEs;
+
+    /* Initialize segment registers */
+    Fast486SetSegment(&EmulatorContext, FAST486_REG_DS, Registers->SegDs);
+    Fast486SetSegment(&EmulatorContext, FAST486_REG_ES, Registers->SegEs);
 
     /* Set Eflags */
     EmulatorContext.Flags.Long = 0;