diff --git a/VERSION b/VERSION
index 593d990c..2e217430 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.30
+8.3.31
diff --git a/plot/plotCmd.c b/plot/plotCmd.c
index aa710ad0..e77f2480 100644
--- a/plot/plotCmd.c
+++ b/plot/plotCmd.c
@@ -98,6 +98,7 @@ CmdPlot(w, cmd)
     int iwidth, scale;
 
 #ifdef HAVE_LIBCAIRO
+    int flags;
     extern void GrTCairoPlotSVG();
 #endif
 
@@ -271,7 +272,13 @@ CmdPlot(w, cmd)
 			cmdPlotOption[PLOTSVG]);
 		return;
 	    }
+	    flags = window->w_flags;
+	    /* In case this is called from a non-GUI wrapper window, remove */
+	    /* the window border widgets from the rendered display.	    */
+	    window->w_flags &= ~(WIND_SCROLLABLE | WIND_SCROLLBARS | WIND_CAPTION
+			| WIND_BORDER);
 	    GrTCairoPlotSVG(cmd->tx_argv[2], window);
+	    window->w_flags = flags;
 	    return;
 #endif