diff --git a/src/wmfs.c b/src/wmfs.c
index 290b8fc..0a1a4e3 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -407,15 +407,8 @@ wmfs_quit(void)
      struct client *c;
      struct mousebind *m;
 
-     /* Will free:
-      *
-      * Screens -> tags
-      *         -> Infobars -> Elements
-      */
      ewmh_update_wmfs_props();
 
-     screen_free();
-
      XFreeGC(W->dpy, W->rgc);
 
      while(!SLIST_EMPTY(&W->h.client))
@@ -426,6 +419,14 @@ wmfs_quit(void)
           client_remove(c);
      }
 
+
+     /* Will free:
+      *
+      * Screens -> tags
+      *         -> Infobars -> Elements
+      */
+     screen_free();
+
      /* Conf stuffs */
      while(!SLIST_EMPTY(&W->h.theme))
      {