diff --git a/ChangeLog b/ChangeLog
index bf7cba0af..2997d2f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-10 Erwann Chenede - <erwann.chenede@sun.com>
+
+        * src/keybindings.c : (handle_close_window, handle_minimize_window)
+	verify the active window has the appropriate close/minimize function
+	before closing or minimizing the window.
+			
 2002-06-09  Havoc Pennington  <hp@pobox.com>
 
 	* configure.in: 2.3.987
diff --git a/src/keybindings.c b/src/keybindings.c
index b28b02b3c..409404758 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1743,7 +1743,8 @@ handle_close_window       (MetaDisplay    *display,
                            MetaKeyBinding *binding)
 {
   if (window)
-    meta_window_delete (window, event->xkey.time);
+     if (window->has_close_func)
+       meta_window_delete (window, event->xkey.time);
 }
 
 static void
@@ -1753,7 +1754,8 @@ handle_minimize_window (MetaDisplay    *display,
                         MetaKeyBinding *binding)
 {
   if (window)
-    meta_window_minimize (window);
+     if (window->has_minimize_func)
+       meta_window_minimize (window);
 }
 
 static void