diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 83a3374..27b0521 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3716,6 +3716,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
     memset(info->FB + pScrn->fbOffset, 0,
            pScrn->virtualY * pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
 
+    /* xf86SetDesiredModes() accesses pScrn->pScreen */
+    pScrn->pScreen = pScreen;
+
     /* set the modes with desired rotation, etc. */
     if (!xf86SetDesiredModes (pScrn))
 	return FALSE;