diff --git a/cif/CIFhier.c b/cif/CIFhier.c
index 828bf289..d9b36025 100644
--- a/cif/CIFhier.c
+++ b/cif/CIFhier.c
@@ -735,8 +735,10 @@ CIFGenSubcells(
 
     /* This routine can take a long time, so use the display
      * timer to force a 5-second progress check (like is done
-     * with extract)
+     * with extract).  Save and restore GrDisplayStatus so that
+     * a headless (DISPLAY_SUSPEND) build isn't left in DISPLAY_IDLE.
      */
+    unsigned char savedDisplayStatus = GrDisplayStatus;
     GrDisplayStatus = DISPLAY_IN_PROGRESS;
     SigSetTimer(5);			/* Print at 5-second intervals */
     cuts = 0;
@@ -861,7 +863,7 @@ CIFGenSubcells(
 
     CIFHierTileOps += CIFTileOps - oldTileOps;
 
-    GrDisplayStatus = DISPLAY_IDLE;
+    GrDisplayStatus = savedDisplayStatus;
     SigRemoveTimer();
 
     UndoEnable();
diff --git a/extract/ExtSubtree.c b/extract/ExtSubtree.c
index 7b68b1fd..733baddf 100644
--- a/extract/ExtSubtree.c
+++ b/extract/ExtSubtree.c
@@ -174,8 +174,10 @@ extSubtree(parentUse, reg, f)
     int cuts, totcuts;
     float pdone, plast;
     SearchContext scx;
+    int savedDisplayStatus;
 
     /* Use the display timer to force a 5-second progress check */
+    savedDisplayStatus = GrDisplayStatus;
     GrDisplayStatus = DISPLAY_IN_PROGRESS;
     SigSetTimer(5);		    /* Print at 5-second intervals */
 
@@ -348,7 +350,7 @@ done:
     /* Output connections and node adjustments */
     extOutputConns(&ha.ha_connHash, f);
     HashKill(&ha.ha_connHash);
-    GrDisplayStatus = DISPLAY_IDLE;
+    GrDisplayStatus = savedDisplayStatus;
     SigRemoveTimer();
 
     /* Clear the CU_SUB_EXTRACTED flag from all children instances */