diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 77076fc..79a1ac3 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1050,6 +1050,9 @@
     xpad = gui.formwin->allocation.width - gui.drawarea->allocation.width
 							 - gui.scrollbar_width;
 #endif
+    if (gui.which_scrollbars[SBAR_LEFT] && gui.which_scrollbars[SBAR_RIGHT])
+	xpad -= gui.scrollbar_width;
+
     return (xpad < 0) ? 0 : xpad;
 }
 
diff --git a/src/version.c b/src/version.c
index 3ac26ab..b3de4a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2939,
+/**/
     2938,
 /**/
     2937,