diff --git a/src/CopyCmap.c b/src/CopyCmap.c
index 5444550c..b4954b01 100644
--- a/src/CopyCmap.c
+++ b/src/CopyCmap.c
@@ -53,12 +53,12 @@ Colormap XCopyColormapAndFree(
     mid = req->mid = XAllocID(dpy);
     req->srcCmap = src_cmap;
 
-    UnlockDisplay(dpy);
-    SyncHandle();
-
 #if XCMS
     _XcmsCopyCmapRecAndFree(dpy, src_cmap, mid);
 #endif
 
+    UnlockDisplay(dpy);
+    SyncHandle();
+
     return(mid);
 }
diff --git a/src/CrCmap.c b/src/CrCmap.c
index 9904c7dd..1b18a15b 100644
--- a/src/CrCmap.c
+++ b/src/CrCmap.c
@@ -48,12 +48,12 @@ Colormap XCreateColormap(
     if (visual == CopyFromParent) req->visual = CopyFromParent;
     else req->visual = visual->visualid;
 
-    UnlockDisplay(dpy);
-    SyncHandle();
-
 #ifdef XCMS
     _XcmsAddCmapRec(dpy, mid, w, visual);
 #endif
 
+    UnlockDisplay(dpy);
+    SyncHandle();
+
     return(mid);
 }
diff --git a/src/FreeCmap.c b/src/FreeCmap.c
index e2b76fa6..68496dd8 100644
--- a/src/FreeCmap.c
+++ b/src/FreeCmap.c
@@ -41,12 +41,12 @@ XFreeColormap(
     LockDisplay(dpy);
     GetResReq(FreeColormap, cmap, req);
 
-    UnlockDisplay(dpy);
-    SyncHandle();
-
 #ifdef XCMS
     _XcmsDeleteCmapRec(dpy, cmap);
 #endif
 
+    UnlockDisplay(dpy);
+    SyncHandle();
+
     return 1;
 }