diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index a569fc7..e32c1c7 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -772,6 +772,7 @@ DUMMYCreateWindow(WindowPtr pWin)
 
     pScreen->CreateWindow = dPtr->CreateWindow;
     ret = pScreen->CreateWindow(pWin);
+    dPtr->CreateWindow = pScreen->CreateWindow;
     pScreen->CreateWindow = DUMMYCreateWindow;
 
     if(ret != TRUE)