diff --git a/src/i830_driver.c b/src/i830_driver.c
index e1ab536..9cf8ef4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2024,7 +2024,7 @@ SaveHWState(ScrnInfoPtr pScrn)
    }
 
    vgaHWUnlock(hwp);
-   vgaHWSave(pScrn, vgaReg, VGA_SR_FONTS);
+   vgaHWSave(pScrn, vgaReg, VGA_SR_ALL);
 
    return TRUE;
 }
@@ -2233,7 +2233,7 @@ RestoreHWState(ScrnInfoPtr pScrn)
        OUTREG(FBC_CONTROL, pI830->saveFBC_CONTROL);
    }
 
-   vgaHWRestore(pScrn, vgaReg, VGA_SR_FONTS);
+   vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL);
    vgaHWLock(hwp);
 
    return TRUE;