diff --git a/ChangeLog b/ChangeLog
index eb97fd57df..b4014918bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-25  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+	* app/tools/gimpselectiontool.c (gimp_selection_tool_modifier_key):
+	When Alt is down, don't allow other modifiers to change the
+	operation shown in the options.  Fixes bug #349338.
+	
 2006-08-25  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
 
 	* app/core/gimpchannel-select.[ch]: add push_undo arguments
diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c
index 6ee6f87ecd..3e8fd0f007 100644
--- a/app/tools/gimpselectiontool.c
+++ b/app/tools/gimpselectiontool.c
@@ -122,40 +122,49 @@ gimp_selection_tool_modifier_key (GimpTool        *tool,
 
   options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
 
-  if (key == GDK_SHIFT_MASK || key == GDK_CONTROL_MASK)
+  if (key == GDK_SHIFT_MASK   ||
+      key == GDK_CONTROL_MASK ||
+      key == GDK_MOD1_MASK)
     {
       SelectOps button_op = options->operation;
 
-      if (press)
+      if (state & GDK_MOD1_MASK)
         {
-          if (key == (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
-            {
-              /*  first modifier pressed  */
-
-              selection_tool->saved_op = options->operation;
-            }
+          button_op = selection_tool->saved_op;
         }
       else
         {
-          if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
+          if (press)
             {
-              /*  last modifier released  */
+              if (key == (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
+                {
+                  /*  first modifier pressed  */
 
-              button_op = selection_tool->saved_op;
+                  selection_tool->saved_op = options->operation;
+                }
             }
-        }
+          else
+            {
+              if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
+                {
+                  /*  last modifier released  */
 
-      if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
-        {
-          button_op = SELECTION_INTERSECT;
-        }
-      else if (state & GDK_SHIFT_MASK)
-        {
-          button_op = SELECTION_ADD;
-        }
-      else if (state & GDK_CONTROL_MASK)
-        {
-          button_op = SELECTION_SUBTRACT;
+                  button_op = selection_tool->saved_op;
+                }
+            }
+
+          if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
+            {
+              button_op = SELECTION_INTERSECT;
+            }
+          else if (state & GDK_SHIFT_MASK)
+            {
+              button_op = SELECTION_ADD;
+            }
+          else if (state & GDK_CONTROL_MASK)
+            {
+              button_op = SELECTION_SUBTRACT;
+            }
         }
 
       if (button_op != options->operation)