diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
index 665f620..cc438d1 100644
--- a/vmwgfx/vmwgfx_driver.c
+++ b/vmwgfx/vmwgfx_driver.c
@@ -1196,7 +1196,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
     pScrn->vtSema = TRUE;
 
     pScreen->SaveScreen = xf86SaveScreen;
-    vmwgfx_wrap(ms, pScreen, CloseScreen, drv_close_screen);
 
     if (!xf86CrtcScreenInit(pScreen))
 	return FALSE;
@@ -1213,7 +1212,7 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
     if (serverGeneration == 1)
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
-
+    vmwgfx_wrap(ms, pScreen, CloseScreen, drv_close_screen);
     vmwgfx_wrap(ms, pScrn, EnterVT, drv_enter_vt);
     vmwgfx_wrap(ms, pScrn, LeaveVT, drv_leave_vt);
     vmwgfx_wrap(ms, pScrn, AdjustFrame, drv_adjust_frame);