diff --git a/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.h b/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.h
index 52a79e8ae..0fcd79557 100644
--- a/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.h
+++ b/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.h
@@ -18,6 +18,7 @@
 }
 
 @property XCCCappuccinoProjectController *cappuccinoProjectController;
+@property BOOL                           selected;
 
 - (void)selectItem:(id)anItem;
 - (void)reload;
diff --git a/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.m b/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.m
index 8fdf3ac89..10d71a5de 100644
--- a/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.m
+++ b/Tools/XcodeCapp/XcodeCapp/XCCErrorsViewController.m
@@ -54,6 +54,9 @@
 
 - (void)reload
 {
+    if (!_selected)
+        return;
+    
     [self->errorOutlineView reloadData];
     [self->errorOutlineView expandItem:nil expandChildren:YES];
 
diff --git a/Tools/XcodeCapp/XcodeCapp/XCCMainController.m b/Tools/XcodeCapp/XcodeCapp/XCCMainController.m
index 6fc826c61..847d9aa5e 100644
--- a/Tools/XcodeCapp/XcodeCapp/XCCMainController.m
+++ b/Tools/XcodeCapp/XcodeCapp/XCCMainController.m
@@ -344,11 +344,26 @@
     [self _setTextColor:[NSColor colorWithCalibratedRed:107.0/255.0 green:148.0/255.0 blue:236.0/255.0 alpha:1.0] forButton:sender];
 
     if (sender == self->buttonSelectConfigurationTab)
+    {
+        [_operationsViewController setSelected:NO];
+        [_errorsViewController setSelected:NO];
         [self->tabViewProject selectTabViewItemAtIndex:0];
-    if (sender == self->buttonSelectErrorsTab)
+    }
+    else if (sender == self->buttonSelectErrorsTab)
+    {
+        [_operationsViewController setSelected:NO];
+        [_errorsViewController setSelected:YES];
         [self->tabViewProject selectTabViewItemAtIndex:1];
-    if (sender == self->buttonSelectOperationsTab)
+        [_errorsViewController reload];
+    }
+    else if (sender == self->buttonSelectOperationsTab)
+    {
+        [_operationsViewController setSelected:YES];
+        [_errorsViewController setSelected:NO];
         [self->tabViewProject selectTabViewItemAtIndex:2];
+        [_operationsViewController reload];
+    }
+    
 }
 
 
diff --git a/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.h b/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.h
index 2b2cdc799..3353e3c2f 100644
--- a/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.h
+++ b/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.h
@@ -20,6 +20,7 @@
 }
 
 @property XCCCappuccinoProjectController *cappuccinoProjectController;
+@property BOOL                           selected;
 
 - (void)reload;
 - (IBAction)cancelAllOperations:(id)sender;
diff --git a/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.m b/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.m
index 61d4e3747..8db695a22 100644
--- a/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.m
+++ b/Tools/XcodeCapp/XcodeCapp/XCCOperationsViewController.m
@@ -56,6 +56,9 @@
 
 - (void)reload
 {
+    if (!_selected)
+        return;
+    
     [self->operationTableView reloadData];
 
     [self _showMaskingView:![self.cappuccinoProjectController projectRelatedOperations].count];