diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java
index 0a000dee4c7..6c0bf949578 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java
@@ -105,7 +105,8 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi
 		fPart.addPropertyListener(new IPropertyListener() {			
 			public void propertyChanged(Object source, int propId) {
 				if (IWorkbenchPartConstants.PROP_CONTENT_DESCRIPTION == propId) {
-					updatePinContextLabel(fProvider);
+					if (fAction != null && fAction.isChecked())
+						updatePinContextLabel(fProvider);
 				} else if (IWorkbenchPartConstants.PROP_PART_NAME == propId) {
 					PinCloneUtils.setPartTitle(fPart);
 				}