diff --git a/ChangeLog b/ChangeLog
index fa7074d04..3713b5af2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-09 13:43-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/GSTheme.m: Move call to listen to default changes to 
+	activate instead of +initialize. 
+
 2011-06-07 07:40-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSMenuItem.m: Remove temporary fix. 
diff --git a/Source/GSTheme.m b/Source/GSTheme.m
index a42967cf1..3fbe81952 100644
--- a/Source/GSTheme.m
+++ b/Source/GSTheme.m
@@ -290,11 +290,6 @@ typedef	struct {
   if (themes == nil)
     {
       themes = [NSMutableDictionary new];
-      [[NSNotificationCenter defaultCenter]
-	addObserver: self
-	selector: @selector(defaultsDidChange:)
-	name: NSUserDefaultsDidChangeNotification
-	object: nil];
       null = RETAIN([NSNull null]);
       defaultTheme = [[self alloc] initWithBundle: nil];
       ASSIGN(theTheme, defaultTheme);
@@ -614,6 +609,16 @@ typedef	struct {
     {
       [[[window contentView] superview] setNeedsDisplay: YES];
     }
+
+  /*
+   * Listen to notifications
+   */ 
+  [[NSNotificationCenter defaultCenter]
+	addObserver: [self class]
+	   selector: @selector(defaultsDidChange:)
+	       name: NSUserDefaultsDidChangeNotification
+	     object: nil];
+  
 }
 
 - (NSArray*) authors