diff --git a/ChangeLog b/ChangeLog
index 0be74c85d..d6ca63b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-01  Matt Kraai  <kraai@ftbfs.org>
+
+        Set prop_hooks_table to NULL after freeing it.
+
+	* src/core/window-props.c:
+
 2009-01-29  Thomas Thurman  <tthurman@gnome.org>
 
         Window properties are looked up in a hash table rather than
diff --git a/src/core/window-props.c b/src/core/window-props.c
index 478555375..2ef3597a5 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1463,10 +1463,10 @@ void
 meta_display_free_window_prop_hooks (MetaDisplay *display)
 {
   g_hash_table_unref (display->prop_hooks);
-  display->prop_hooks_table = NULL;
+  display->prop_hooks = NULL;
 
   g_free (display->prop_hooks_table);
-  display->prop_hooks = NULL;
+  display->prop_hooks_table = NULL;
 }
 
 static MetaWindowPropHooks*