diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 745d3ce81..da3c57985 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -60,6 +60,7 @@
 #include "dmxatom.h"
 #include "dmxshm.h"
 #include "dmxdnd.h"
+#include "dmxlaunch.h"
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -1405,6 +1406,9 @@ Bool dmxCloseScreen(int idx, ScreenPtr pScreen)
 	dmxScreen->bePixmapFormats = NULL;
     }
 
+    if (idx == 0)
+	dmxAbortDisplay ();
+
     DMX_UNWRAP(CloseScreen, dmxScreen, pScreen);
     return pScreen->CloseScreen(idx, pScreen);
 }