diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 08290a56f4..0b98fd49e3 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1107,7 +1107,7 @@ adjustment_value_changed(GtkAdjustment *adjustment, gpointer data)
     {
 	dragging = TRUE;
 
-	if (sb->wp != NULL)
+	if (sb->wp != NULL && GDK_IS_DRAWABLE(sb->id->window))
 	{
 	    int			x;
 	    int			y;
diff --git a/src/version.c b/src/version.c
index 1e02a5844c..0a6c036231 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4599,
 /**/
     4598,
 /**/