diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java
index 7aa7f81a05c..3b5dfa3ad62 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java
@@ -12,6 +12,7 @@ package org.eclipse.cdt.internal.ui.buildconsole;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IBuildConsoleManager;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.ui.console.AbstractConsole;
 import org.eclipse.ui.console.IConsoleView;
@@ -24,9 +25,9 @@ public class BuildConsole extends AbstractConsole {
 	 */
 	public static final String P_STREAM_COLOR = CUIPlugin.PLUGIN_ID  + ".CONSOLE_P_STREAM_COLOR";	 //$NON-NLS-1$
 
-	private BuildConsoleManager fConsoleManager;
+	private IBuildConsoleManager fConsoleManager;
 
-	public BuildConsole(BuildConsoleManager manager) {
+	public BuildConsole(IBuildConsoleManager manager) {
 		super(ConsoleMessages.getString("BuildConsole.buildConsole"), CPluginImages.DESC_BUILD_CONSOLE); //$NON-NLS-1$
 		fConsoleManager = manager;
 	}
@@ -43,7 +44,7 @@ public class BuildConsole extends AbstractConsole {
 		setName(title);
 	}
 
-	public BuildConsoleManager getConsoleManager() {
+	public IBuildConsoleManager getConsoleManager() {
 	    return fConsoleManager;
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java
index 971fd08b6db..18d9122658c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java
@@ -53,6 +53,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 	static public final int BUILD_STREAM_TYPE_INFO = 0;
 	static public final int BUILD_STREAM_TYPE_OUTPUT = 1;
 	static public final int BUILD_STREAM_TYPE_ERROR = 2;
+	private IProject fLastProject;
 
 	public BuildConsoleManager() {
 	}
@@ -246,9 +247,19 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 
 	public IConsole getConsole(IProject project) {
 		Assert.isNotNull(project);
+		fLastProject = project;
 		return getConsolePartioner(project).getConsole();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.ui.IBuildConsoleManager#getLastBuiltProject()
+	 */
+	public IProject getLastBuiltProject() {
+		return fLastProject;
+	}
+	
 	private BuildConsolePartitioner getConsolePartioner(IProject project) {
 		BuildConsolePartitioner partioner = (BuildConsolePartitioner)fConsoleMap.get(project);
 		if (partioner == null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index 9543c051cc1..6ab2086a3b6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -19,6 +19,7 @@ import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IBuildConsoleEvent;
 import org.eclipse.cdt.ui.IBuildConsoleListener;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
@@ -33,13 +34,16 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IFindReplaceTarget;
 import org.eclipse.jface.text.ITextListener;
 import org.eclipse.jface.text.ITextOperationTarget;
+import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.TextEvent;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -47,10 +51,15 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.console.IConsoleConstants;
@@ -188,9 +197,8 @@ public class BuildConsolePage extends Page
 
 		getConsole().addPropertyChangeListener(this);
 
-		setDocument();
-		getConsole().setTitle(getProject());
 		fViewer.addTextListener(this);
+		setInitialSelection();
 	}
 
 	/**
@@ -321,14 +329,49 @@ public class BuildConsolePage extends Page
 
 	public void init(IPageSite pageSite) {
 		super.init(pageSite);
-		setProject(convertSelectionToProject(getSite().getPage().getSelection()));
-
 		getSite().getPage().addSelectionListener(this);
 		getConsole().getConsoleManager().addConsoleListener(this);
 	}
 
+	protected void setInitialSelection() {
+		// Use the selection, if any
+		Object input;
+		IWorkbenchPage page= getSite().getPage();
+		ISelection selection= null;
+		if (page != null)
+			selection= page.getSelection();
+		if (selection instanceof ITextSelection) {
+			Object part= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
+			if (part instanceof IEditorPart) {
+				setSelectionFromEditor((IEditorPart)part);
+				return;
+			}
+		}
+		selectionChanged(null, selection);
+	}
+
+
+	void setSelectionFromEditor(IEditorPart part) {
+		if (part == null)
+			return;
+		IWorkbenchPartSite site= part.getSite();
+		if (site == null)
+			return;
+		ISelectionProvider provider= site.getSelectionProvider();
+		if (provider != null ) {
+			IEditorInput ei= part.getEditorInput();
+			if (ei instanceof IFileEditorInput) {
+				IFile file= ((IFileEditorInput)ei).getFile();
+				selectionChanged(part, new StructuredSelection(file));
+			}
+		}
+	}
+	
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 		IProject newProject = convertSelectionToProject(selection);
+		if (newProject == null) {
+			newProject = getConsole().getConsoleManager().getLastBuiltProject();
+		}
 		IProject oldProject = getProject();
 		if (oldProject == null || (newProject != null && !newProject.equals(oldProject))) {
 			setProject(newProject);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IBuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IBuildConsoleManager.java
index 5a9e2b1d072..56857d15cd0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IBuildConsoleManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IBuildConsoleManager.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.text.IDocument;
 public interface IBuildConsoleManager {
 	IConsole getConsole(IProject project);
 	IDocument getConsoleDocument(IProject project);
+	IProject getLastBuiltProject();
 	void addConsoleListener(IBuildConsoleListener listener);
 	void removeConsoleListener(IBuildConsoleListener listener);
 }