diff --git a/Tools/XcodeCapp/XcodeCapp/AppController.h b/Tools/XcodeCapp/XcodeCapp/AppController.h
index 7278bd236..0e41cc26f 100644
--- a/Tools/XcodeCapp/XcodeCapp/AppController.h
+++ b/Tools/XcodeCapp/XcodeCapp/AppController.h
@@ -22,7 +22,7 @@
 
 @class XcodeCapp;
 
-@interface AppController : NSObject <NSApplicationDelegate, NSMenuDelegate>
+@interface AppController : NSObject <NSApplicationDelegate, NSMenuDelegate, NSUserNotificationCenterDelegate>
 
 @property (strong) IBOutlet NSMenu                *statusMenu;
 @property (unsafe_unretained) IBOutlet NSMenuItem *menuItemHistory;
diff --git a/Tools/XcodeCapp/XcodeCapp/AppController.m b/Tools/XcodeCapp/XcodeCapp/AppController.m
index 055c0029e..551f74751 100644
--- a/Tools/XcodeCapp/XcodeCapp/AppController.m
+++ b/Tools/XcodeCapp/XcodeCapp/AppController.m
@@ -111,7 +111,10 @@ AppController *SharedAppControllerInstance = nil;
         [[NSApplication sharedApplication] terminate:self];
         return;
     }
-
+    
+    NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
+    center.delegate = self;
+    
     // If we were opened from the command line, self.pathToOpenAtLaunch will be set.
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
@@ -527,4 +530,12 @@ AppController *SharedAppControllerInstance = nil;
     self.menuItemHistory.enabled = [projectHistory count] > 0;
 }
 
+- (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification
+{
+    if ([[self.xcc errorList] count])
+        [self.xcc openErrorsPanel:self];
+    
+    [center removeDeliveredNotification:notification];
+}
+
 @end