diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
index 72d8adfc0b6..71e173fb1e2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
@@ -210,6 +210,7 @@ public class OpenIncludeAction extends Action {
 					IPath rPath = proxy.requestResource().getLocation();
 					int numSegToRemove = rPath.segmentCount() - name.segmentCount();
 					IPath sPath = rPath.removeFirstSegments(numSegToRemove);
+					sPath = sPath.setDevice(name.getDevice());
 					if (sPath.equals(name))
 						list.add(rPath);
 					return false;