diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index b8bb46f18cc..d94a60dca7a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -59,6 +59,7 @@ import org.eclipse.ui.part.ViewPart;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.IFunction;
+import org.eclipse.cdt.core.model.IMethod;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.refactoring.actions.CRefactoringActionGroup;
 import org.eclipse.cdt.ui.CUIPlugin;
@@ -167,7 +168,7 @@ public class CHViewPart extends ViewPart {
     }
 
 	private boolean allowsRefTo(ICElement element) {
-		if (element instanceof IFunction) {
+		if (element instanceof IFunction || element instanceof IMethod) {
 			return true;
 		}
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
index d2de5dddec9..ed52a57f518 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
@@ -359,7 +359,7 @@ public class CElementLabels {
 		//qualification
 		if( getFlag( flags, M_FULLY_QUALIFIED ) ){
 			ICElement parent = method.getParent();
-			if (parent != null && parent.exists()) {
+			if (parent != null && parent.exists() && !(parent instanceof ITranslationUnit)) {
 				getTypeLabel( parent, T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf );
 				buf.append( "::" ); //$NON-NLS-1$
 			}