diff --git a/calmwm.c b/calmwm.c
index afb5e6d..a6c5bc4 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -161,9 +161,8 @@ x_teardown(void)
 			XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which),
 			    DefaultColormap(X_Dpy, sc->which),
 			    &sc->xftcolor[i]);
-		XftDrawDestroy(sc->menu.xftdraw);
 		XftFontClose(X_Dpy, sc->xftfont);
-		XUnmapWindow(X_Dpy, sc->menu.win);
+		XftDrawDestroy(sc->menu.xftdraw);
 		XDestroyWindow(X_Dpy, sc->menu.win);
 		XUngrabKey(X_Dpy, AnyKey, AnyModifier, sc->rootwin);
 	}