diff --git a/Changelog b/Changelog
index 4ad807a..b2c6c56 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+
+2006-03-01  Rene Rebe <rene@exactcode.de>
+
+	* src/xscanimage.c: Fixed scan_button sensitivity after a failure
+	  at sane_start time, e.g. no documents. Formerly the button was left
+	  inactive.
+
 2006-01-18  Gerhard Jaeger <gerhard@gjaeger.de>
 
 	* src/xscanimage.c: Fixed bug reported by Johannes Meixner, see
diff --git a/src/xscanimage.c b/src/xscanimage.c
index 3c17771..86e625f 100644
--- a/src/xscanimage.c
+++ b/src/xscanimage.c
@@ -4,6 +4,7 @@
    Andreas Beck <becka@sunserver1.rz.uni-duesseldorf.de>
    Tristan Tarrant <ttarrant@etnoteam.it>
    David Mosberger-Tang <davidm@azstarnet.com>
+   Rene Rebe <rene@exactcode.de>
 
    Copyright (C) 1997, 1998 Andreas Beck, Tristan Tarrant, and David
    Mosberger
@@ -1092,6 +1093,7 @@ scan_start (void)
   if (status != SANE_STATUS_GOOD)
     {
       gsg_set_sensitivity (dialog, TRUE);
+      gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
       snprintf (buf, sizeof (buf), "Failed to start scanner: %s",
 		sane_strstatus (status));
       gsg_error (buf);
@@ -1112,6 +1114,7 @@ scan_start (void)
   if (scan_win.param.lines == -1)
     {
       gsg_set_sensitivity (dialog, TRUE);
+      gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
       snprintf (buf, sizeof (buf), "Hand-Scanner mode not supported");
       gsg_error (buf);
       scan_done ();
@@ -1153,6 +1156,7 @@ scan_start (void)
 	      if (scan_win.param.depth > 8)
 		{
 		  gsg_set_sensitivity (dialog, TRUE);
+		  gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
 		  snprintf (buf, sizeof (buf),
 			    "Separate channel transfers are not supported "
 			    "with %d bits/channel.", scan_win.param.depth);
@@ -1197,6 +1201,7 @@ scan_start (void)
       if (scan_win.param.depth > 8)
 	{
 	  gsg_set_sensitivity (dialog, TRUE);
+	  gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
 	  snprintf (buf, sizeof (buf), "The Gimp doesn't support images "
 		    "with %d bits/channel.", scan_win.param.depth);
 	  gsg_error (buf);