diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 6f4b562..560b9b5 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -759,20 +759,20 @@ dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     return(TRUE);
 }
 
-
 Atom VFB_PROP  = 0;
 #define  VFB_PROP_NAME  "VFB_IDENT"
 
-
-
 static Bool
 DUMMYCreateWindow(WindowPtr pWin)
 {
     DUMMYPtr dPtr = DUMMYPTR(DUMMYScrn);
     WindowPtr pWinRoot;
     int ret;
-	
+
+    pScreen->CreateWindow = dPtr->CreateWindow;
     ret = dPtr->CreateWindow(pWin);
+    pScreen->CreateWindow = DUMMYCreateWindow;
+
     if(ret != TRUE)
 	return(ret);