diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index abf7d5c..b37082e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3791,7 +3791,6 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
 	    (((pScrn->displayWidth * info->CurrentLayout.pixel_bytes / 64)
 	      << 22) | ((info->fbLocation + pScrn->fbOffset) >> 10));
 	RADEONInitMemMapRegisters(pScrn, save, info);
-	RADEONRestoreMemMapRegisters(pScrn, save);
     }
 
 #ifdef USE_EXA
@@ -4929,6 +4928,8 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 	    crtc->desiredY = 0;
 	}
 
+	RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
+
 	if (!xf86CrtcSetMode (crtc, &crtc->desiredMode, crtc->desiredRotation,
 			      crtc->desiredX, crtc->desiredY))
 	    return FALSE;
@@ -4947,8 +4948,6 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 	/* get the DRI back into shape after resume */
 	RADEONDRISetVBlankInterrupt (pScrn, TRUE);
 	RADEONDRIResume(pScrn->pScreen);
-	RADEONAdjustMemMapRegisters(pScrn, info->ModeReg);
-
     }
 #endif
     /* this will get XVideo going again, but only if XVideo was initialised