diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m
index 77bee5e..525a599 100644
--- a/Framework/PCProjectManager.m
+++ b/Framework/PCProjectManager.m
@@ -380,7 +380,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
 
       [[NSNotificationCenter defaultCenter]
 	postNotificationName:PCActiveProjectDidChangeNotification
-	              object:activeProject];
+		      object:activeProject];
     }
 }
 
@@ -707,6 +707,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
   if (flag)
     {
       [self setActiveProject: project];
+      [[project projectWindow] makeKeyAndOrderFront:self];
     }
   
   return project;
@@ -751,7 +752,6 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
   if (filePath != nil)
     {
       [self openProjectAt:filePath makeActive:YES];
-      [[[self activeProject] projectWindow] makeKeyAndOrderFront:self];
     }
 }
 
diff --git a/PCAppController.m b/PCAppController.m
index 2d44b9d..f4120b8 100644
--- a/PCAppController.m
+++ b/PCAppController.m
@@ -126,8 +126,6 @@
       [projectManager openFileAtPath:fileName];
     }
 
-  [[[projectManager activeProject] projectWindow] makeKeyAndOrderFront:self];
-  
   return YES;
 }