diff --git a/src/conky.c b/src/conky.c
index 354bf1a8..9d5f064d 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -7478,12 +7478,12 @@ void clean_up(void)
 	}
 #ifdef X11
 	if (x_initialised == YES) {
+		destroy_window();
 		free_fonts();
 		if(x11_stuff.region) {
 			XDestroyRegion(x11_stuff.region);
 			x11_stuff.region = NULL;
 		}
-		destroy_window();
 		XClearWindow(display, RootWindow(display, screen));
 		XCloseDisplay(display);
 		if(info.x11.desktop.all_names) {
diff --git a/src/x11.c b/src/x11.c
index 6da619e7..5364dce8 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -194,7 +194,6 @@ void set_transparent_background(Window win)
 
 void destroy_window(void)
 {
-	XDestroyWindow(display, window.window);
 	XFreeGC(display, window.gc);
 	memset(&window, 0, sizeof(struct conky_window));
 }