diff --git a/ChangeLog b/ChangeLog
index fb5f98f..8497b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-26 13:01-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Framework/PCEditorManager.m: Scroll to and select the line that
+	the debugger has stopped at.
+	* Modules/Debuggers/ProjectCenter/PCDebuggerView.m: bring the debugger
+	window to the front when a breakpoint is detected.
+
 2008-12-26 02:25-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Framework/PCEditorManager.m
diff --git a/Framework/PCEditorManager.m b/Framework/PCEditorManager.m
index 6607bd8..87924f4 100644
--- a/Framework/PCEditorManager.m
+++ b/Framework/PCEditorManager.m
@@ -398,8 +398,8 @@ NSString *PCEditorDidResignActiveNotification =
   NSString *line = [object objectForKey: @"line"];
   id<CodeEditor> editor = [self openEditorForFile: filePath
 				editable: YES
-				windowed: YES];
-  
+				windowed: NO];
+  [editor scrollToLineNumber: [line intValue]];
   NSLog(@"object = %@", [aNotif object]);
 }
 
diff --git a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m
index cc35040..5a373c4 100644
--- a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m
+++ b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m
@@ -80,6 +80,7 @@
 	  [NOTIFICATION_CENTER 
 	    postNotificationName: PCProjectBreakpointNotification
 	    object: dict];
+	  [[self window] makeKeyAndOrderFront: self];
 	}
     }
 }