diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index 91d3f954f..a3d9d9d04 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -695,6 +695,9 @@ ATIDrawInit(ScreenPtr pScreen)
 	ErrorF("Screen: %d/%d depth/bpp\n", pScreenPriv->screen->fb[0].depth,
 	    pScreenPriv->screen->fb[0].bitsPerPixel);
 
+	RegisterBlockAndWakeupHandlers(ATIBlockHandler, ATIWakeupHandler,
+	    pScreen);
+
 #ifdef USE_DRI
 	atis->using_dri = ATIDRIScreenInit(pScreen);
 #endif /* USE_DRI */
@@ -800,9 +803,6 @@ ATIDrawEnable(ScreenPtr pScreen)
 	} else
 		atis->kaa.UploadToScratch = NULL;
 
-	RegisterBlockAndWakeupHandlers (ATIBlockHandler, ATIWakeupHandler,
-				       pScreen);
-
 	KdMarkSync(pScreen);
 }