diff --git a/cif/CIFrdcl.c b/cif/CIFrdcl.c
index c965bbaa..0f1cd370 100644
--- a/cif/CIFrdcl.c
+++ b/cif/CIFrdcl.c
@@ -1786,8 +1786,8 @@ CIFReadCellCleanup(
     }
 
     /* Do geometrical processing on the top-level cell. */
+    if (filetype == FILE_CIF) CIFPaintCurrent(filetype);
 
-    CIFPaintCurrent(FILE_CIF);
     DBAdjustLabels(EditCellUse->cu_def, &TiPlaneRect);
     DBReComputeBbox(EditCellUse->cu_def);
     DBWAreaChanged(EditCellUse->cu_def, &EditCellUse->cu_def->cd_bbox,