diff --git a/doc/xschem_man/developer_info.html b/doc/xschem_man/developer_info.html
index ad83f17a..02036551 100644
--- a/doc/xschem_man/developer_info.html
+++ b/doc/xschem_man/developer_info.html
@@ -542,6 +542,7 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns"
 
 
 
+
 
 
    <li><kbd>       abort_operation</kbd></li><pre>
@@ -1370,7 +1371,8 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns"
    Undo last action </pre>
    <li><kbd>       undo_type disk|memory</kbd></li><pre>
    Use disk file ('disk') or RAM ('memory') for undo bufer</pre>
-   <li><kbd>       unhilight_all</kbd></li><pre>
+   <li><kbd>       unhilight_all [fast]</kbd></li><pre>
+   if 'fast' is given do not redraw
    Clear all highlights </pre>
    <li><kbd>       unhilight</kbd></li><pre>
    Unhighlight selected nets/pins </pre>
@@ -1456,6 +1458,8 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns"
 
 
 
+
+
 
 
 
diff --git a/src/scheduler.c b/src/scheduler.c
index d02dc94e..f2da7701 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -5042,15 +5042,18 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
       }
     }
 
-    /* unhilight_all
+    /* unhilight_all [fast]
+     *   if 'fast' is given do not redraw
      *   Clear all highlights */
     else if(!strcmp(argv[1], "unhilight_all"))
     {
+      int fast = 0;
       if(!xctx) {Tcl_SetResult(interp, not_avail, TCL_STATIC); return TCL_ERROR;}
+      if(argc > 2 && !strcmp(argv[2], "fast")) fast = 1;
       xctx->enable_drill=0;
       clear_all_hilights();
       /* undraw_hilight_net(1); */
-      draw();
+      if(!fast) draw();
       Tcl_ResetResult(interp);
     }