diff --git a/ChangeLog b/ChangeLog
index 175bca0fc..61a60cddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-01  Havoc Pennington  <hp@pobox.com>
+
+	* src/frames.c (meta_frames_finalize): move the remove_listener
+	to finalize instead of destroy, thanks to Jayaraj for tracking 
+	down the bug.
+
 2002-06-01  Havoc Pennington  <hp@pobox.com>
 
 	* src/session.c: add some missing \n
diff --git a/src/frames.c b/src/frames.c
index 0a07e81e2..c7cba2a5a 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -205,8 +205,6 @@ meta_frames_destroy (GtkObject *object)
   MetaFrames *frames;
   
   frames = META_FRAMES (object);
-  
-  meta_prefs_remove_listener (font_changed_callback, frames);
 
   clear_tip (frames);
   
@@ -239,6 +237,8 @@ meta_frames_finalize (GObject *object)
   
   frames = META_FRAMES (object);
 
+  meta_prefs_remove_listener (font_changed_callback, frames);
+  
   g_hash_table_destroy (frames->text_heights);
   
   g_assert (g_hash_table_size (frames->frames) == 0);