diff --git a/ChangeLog b/ChangeLog
index 1fc17f8e0..9c6968e12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Elijah Newren  <newren gmail com>
+
+	* src/frames.c (meta_frames_button_press_event): Patch from Chris
+	Ball to not minimize in response to double clicks on the titlebar
+	when minimiziation should not be allowed.  #347377
+
 2006-08-07  Elijah Newren  <newren gmail com>
 
 	Patch from Björn Lindqvist to fix button lighting with dragged
diff --git a/src/frames.c b/src/frames.c
index 6b740d9a9..2b629eb17 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -1275,9 +1275,14 @@ meta_frames_button_press_event (GtkWidget      *widget,
 
         case META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE:
           {
-            meta_core_minimize (gdk_display, frame->xwindow);
-            break;
+            flags = meta_core_get_frame_flags (gdk_display, frame->xwindow);
+            
+            if (flags & META_FRAME_ALLOWS_MINIMIZE)
+              {
+                meta_core_minimize (gdk_display, frame->xwindow);
+              }
           }
+          break;
 
         case META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE:
           /* Yaay, a sane user that doesn't use that other weird crap! */