diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
index e45f6004319..e08fe9a063e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
@@ -87,6 +87,16 @@ public class AddExpressionActionDelegate implements IWorkbenchWindowActionDelega
 		}
 		window.getPartService().addPartListener( this );
 		window.getSelectionService().addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
+		IAdaptable context = DebugUITools.getDebugContext();
+		if ( context != null && context instanceof IDebugElement )
+		{
+			IDebugTarget target = ((IDebugElement)context).getDebugTarget();
+			if ( target != null && target instanceof ICExpressionEvaluator )
+			{
+				setDebugTarget( target );
+			}
+			
+		}
 		update();
 	}