diff --git a/ChangeLog b/ChangeLog
index 3a470c7546..bc154e9a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-20  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimpimage-quick-mask.[ch]: remember whether a channel
+	was active before quick mask was activated. Fixes bug #134371.
+
 2007-07-20  Raphaël Quinet  <raphael@gimp.org>
 
 	* plug-ins/faxg3/faxg3.c (query): changed the magic string to
diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c
index 43dad980b9..3a8e997405 100644
--- a/app/core/gimpimage-quick-mask.c
+++ b/app/core/gimpimage-quick-mask.c
@@ -37,29 +37,44 @@
 #include "gimp-intl.h"
 
 
+#define CHANNEL_WAS_ACTIVE (0x2)
+
+
 /*  public functions  */
 
 void
 gimp_image_set_quick_mask_state (GimpImage *image,
-                                 gboolean   quick_mask_state)
+                                 gboolean   active)
 {
   GimpChannel *selection;
   GimpChannel *mask;
+  gboolean     channel_was_active;
 
   g_return_if_fail (GIMP_IS_IMAGE (image));
 
-  if (quick_mask_state == image->quick_mask_state)
+  if (active == gimp_image_get_quick_mask_state (image))
     return;
 
-  /*  set image->quick_mask_state early so we can return early when
-   *  being called recursively
+  /*  Keep track of the state so that we can make the right drawable
+   *  active again when deactiviting quick mask (see bug #134371).
    */
-  image->quick_mask_state = quick_mask_state ? TRUE : FALSE;
+  if (image->quick_mask_state)
+    channel_was_active = (image->quick_mask_state & CHANNEL_WAS_ACTIVE) != 0;
+  else
+    channel_was_active = gimp_image_get_active_channel (image) != NULL;
+
+  /*  Set image->quick_mask_state early so we can return early when
+   *  being called recursively.
+   */
+  image->quick_mask_state = (active
+                             ? TRUE | (channel_was_active ?
+                                       CHANNEL_WAS_ACTIVE : 0)
+                             : FALSE);
 
   selection = gimp_image_get_mask (image);
   mask      = gimp_image_get_quick_mask (image);
 
-  if (quick_mask_state)
+  if (active)
     {
       if (! mask)
         {
@@ -125,6 +140,9 @@ gimp_image_set_quick_mask_state (GimpImage *image,
           gimp_selection_load (gimp_image_get_mask (image), mask);
           gimp_image_remove_channel (image, mask);
 
+          if (! channel_was_active)
+            gimp_image_unset_active_channel (image);
+
           gimp_image_undo_group_end (image);
         }
     }
@@ -137,7 +155,7 @@ gimp_image_get_quick_mask_state (const GimpImage *image)
 {
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
 
-  return image->quick_mask_state;
+  return (image->quick_mask_state != 0);
 }
 
 void
diff --git a/app/core/gimpimage-quick-mask.h b/app/core/gimpimage-quick-mask.h
index b697640002..5f616a3650 100644
--- a/app/core/gimpimage-quick-mask.h
+++ b/app/core/gimpimage-quick-mask.h
@@ -27,7 +27,7 @@
 
 
 void          gimp_image_set_quick_mask_state (GimpImage       *image,
-                                               gboolean         quick_mask_state);
+                                               gboolean         active);
 gboolean      gimp_image_get_quick_mask_state (const GimpImage *image);
 
 void          gimp_image_set_quick_mask_color (GimpImage       *image,