diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 5a2da2e0789..264239d302a 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-19 Mikhail Khodjaiants
+	Fix for bug 26401.
+	* ExpressionDialog.java: Highlight the content of the expression field on intialization.
+
 2002-11-18 Mikhail Khodjaiants
 	Fixes for the 'Add Global Variables' action's bugs.
 	The action disabled after 'Remove All'.
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java
index 299e790ddf5..1522f298130 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java
@@ -85,6 +85,7 @@ public class ExpressionDialog extends Dialog
 	private void initializeDataWidgets()
 	{
 		fTextExpression.setText( fExpression );
+		fTextExpression.selectAll();
 		setOkButtonState();
 	}