diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
index b4df05dafe2..87b83c0afb8 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
@@ -71,11 +71,14 @@
 		          label = "${res:MainWindow.Windows.Debug.AddExpressionBreakpoint}"
 		          shortcut="Shift|F7"
 		          class = "Debugger.AddIn.AddExpressionBreakpointCommand"/>-->
-		<MenuItem id="AddWatchExpression"
-		          insertafter="AddExpressionBreakpoint"
-		          label = "${res:MainWindow.Windows.Debug.AddWatchExpression}"
-		          shortcut="Ctrl|F7"
-		          class = "Debugger.AddIn.AddWatchExpressionCommand"/>
+		<Condition name = "IsTextSelected" action="Disable">
+			<MenuItem id="AddWatchExpression"
+			          insertafter="AddExpressionBreakpoint"
+			          icon = "Icons.16x16.WatchAdd"
+			          label = "${res:MainWindow.Windows.Debug.AddWatchExpression}"
+			          shortcut="Ctrl|F7"
+			          class = "Debugger.AddIn.AddWatchExpressionCommand"/>
+		</Condition>
 	</Path>
 	
 	<Path name="/SharpDevelop/Pads/ClassBrowser/Toolbar">