diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index eb2217f0..eb4a5ae6 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -9,6 +9,7 @@
 #import "MPEntryViewController.h"
 #import "MPAppDelegate.h"
 #import "MPOutlineViewDelegate.h"
+#import "MPOutlineViewController.h"
 #import "MPDocument.h"
 #import "MPIconHelper.h"
 #import "MPDocumentWindowController.h"
@@ -108,12 +109,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
                            _toggleFilterURLButton : @(MPFilterUrls)
                            } retain];
     _entryArrayController = [[NSArrayController alloc] init];
-    _selectedEntry = nil;
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(_didChangeGroupSelectionInOutlineView:)
-                                                 name:MPOutlineViewDidChangeGroupSelection
-                                               object:nil];
-    
+    _selectedEntry = nil;    
   }
   return self;
 }
@@ -131,6 +127,13 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [self.view setWantsLayer:YES];
   [self _hideStatusBarAnimated:NO];
   
+  MPDocumentWindowController *windowController = [self windowController];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(_didChangeGroupSelectionInOutlineView:)
+                                               name:MPOutlineViewDidChangeGroupSelection
+                                             object:windowController.outlineViewController.outlineDelegate];
+  
+  
   [self.entryTable setDelegate:self];
   [self.entryTable setDoubleAction:@selector(_columnDoubleClick:)];
   [self.entryTable setTarget:self];
diff --git a/MacPass/MPOutlineViewController.h b/MacPass/MPOutlineViewController.h
index 12e52644..eb7d9c1e 100644
--- a/MacPass/MPOutlineViewController.h
+++ b/MacPass/MPOutlineViewController.h
@@ -8,8 +8,12 @@
 
 #import "MPViewController.h"
 
+@class MPOutlineViewDelegate;
+
 @interface MPOutlineViewController : MPViewController
 
+@property (retain, readonly) MPOutlineViewDelegate *outlineDelegate;
+
 - (void)clearSelection;
 - (void)showOutline;
 
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 0ae8c839..ab1ee475 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -46,7 +46,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>666</string>
+	<string>668</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>