--- a/scripts/plot/waitbar.m	Sat Jul 27 18:48:12 2013 +0200
+++ b/scripts/plot/waitbar.m	Wed Aug 07 18:47:38 2013 -0700
@@ -107,13 +107,16 @@
       endif
     endif
   else
-    h = __go_figure__ (NaN, "position", [250, 500, 400, 100],
-                       "numbertitle", "off",
-                       "toolbar", "none", "menubar", "none",
-                       "integerhandle", "off",
-                       "handlevisibility", "callback",
-                       "tag", "waitbar",
-                       varargin{:});
+    ## Save and restore current figure
+    cf = get (0, "currentfigure");
+
+    h = figure ("position", [250, 500, 400, 100],
+                "numbertitle", "off",
+                "toolbar", "none", "menubar", "none",
+                "integerhandle", "off",
+                "handlevisibility", "callback",
+                "tag", "waitbar",
+                varargin{:});
 
     ax = axes ("parent", h, "xtick", [], "ytick", [],
                "xlim", [0, 1], "ylim", [0, 1],
@@ -129,6 +132,10 @@
       msg = "Please wait...";
     endif
     title (ax, msg);
+
+    if (! isempty (cf))
+      set (0, "currentfigure", cf);
+    endif
   endif
 
   drawnow ();