diff --git a/debugger/watchesdlg.lfm b/debugger/watchesdlg.lfm
index a19b510f51..e4fda2c9eb 100644
--- a/debugger/watchesdlg.lfm
+++ b/debugger/watchesdlg.lfm
@@ -148,6 +148,12 @@ inherited WatchesDlg: TWatchesDlg
     object N3: TMenuItem
       Caption = '-'
     end
+    object popInspect: TMenuItem
+      Action = actInspect
+    end
+    object popEvaluate: TMenuItem
+      Action = actEvaluate
+    end
     object popAddWatchPoint: TMenuItem
       Action = actAddWatchPoint
     end
@@ -217,10 +223,6 @@ inherited WatchesDlg: TWatchesDlg
       )
       ShortCut = 16453
     end
-    object actAddWatchPoint: TAction
-      Caption = 'actAddWatchPoint'
-      OnExecute = actAddWatchPointExecute
-    end
     object actCopyName: TAction
       Category = 'copy'
       Caption = 'actCopyName'
@@ -231,5 +233,17 @@ inherited WatchesDlg: TWatchesDlg
       Caption = 'actCopyValue'
       OnExecute = actCopyValueExecute
     end
+    object actAddWatchPoint: TAction
+      Caption = 'actAddWatchPoint'
+      OnExecute = actAddWatchPointExecute
+    end
+    object actInspect: TAction
+      Caption = 'actInspect'
+      OnExecute = actInspectExecute
+    end
+    object actEvaluate: TAction
+      Caption = 'actEvaluate'
+      OnExecute = actEvaluateExecute
+    end
   end
 end
diff --git a/debugger/watchesdlg.pp b/debugger/watchesdlg.pp
index f3b10b84b9..f2c51eb49b 100644
--- a/debugger/watchesdlg.pp
+++ b/debugger/watchesdlg.pp
@@ -63,12 +63,16 @@ type
     actAddWatchPoint: TAction;
     actCopyName: TAction;
     actCopyValue: TAction;
+    actInspect: TAction;
+    actEvaluate: TAction;
     actToggleCurrentEnable: TAction;
     actPower: TAction;
     ActionList1: TActionList;
     actProperties: TAction;
     lvWatches: TListView;
     MenuItem1: TMenuItem;
+    popInspect: TMenuItem;
+    popEvaluate: TMenuItem;
     popCopyName: TMenuItem;
     popCopyValue: TMenuItem;
     N3: TMenuItem;
@@ -101,6 +105,8 @@ type
     procedure actCopyValueExecute(Sender: TObject);
     procedure actDisableSelectedExecute(Sender: TObject);
     procedure actEnableSelectedExecute(Sender: TObject);
+    procedure actEvaluateExecute(Sender: TObject);
+    procedure actInspectExecute(Sender: TObject);
     procedure actPowerExecute(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -239,6 +245,9 @@ begin
   actCopyName.Caption := lisLocalsDlgCopyName;
   actCopyValue.Caption := lisLocalsDlgCopyValue;
 
+  actInspect.Caption := lisInspect;
+  actEvaluate.Caption := lisEvaluateModify;
+
   Caption:=liswlWatchList;
 
   lvWatches.Columns[0].Caption:=liswlExpression;
@@ -328,6 +337,8 @@ begin
     actAddWatch.Enabled := False;
     actPower.Enabled := False;
     actAddWatchPoint.Enabled := False;
+    actEvaluate.Enabled := False;
+    actInspect.Enabled := False;
     exit;
   end;
 
@@ -359,6 +370,8 @@ begin
   actDeleteSelected.Enabled := ItemSelected;
 
   actAddWatchPoint.Enabled := ItemSelected;
+  actEvaluate.Enabled := ItemSelected;
+  actInspect.Enabled := ItemSelected;
 
   actEnableAll.Enabled := AllCanEnable;
   actDisableAll.Enabled := AllCanDisable;
@@ -429,6 +442,16 @@ begin
   end;
 end;
 
+procedure TWatchesDlg.actEvaluateExecute(Sender: TObject);
+begin
+  DebugBoss.EvaluateModify(lvWatches.Selected.Caption);
+end;
+
+procedure TWatchesDlg.actInspectExecute(Sender: TObject);
+begin
+  DebugBoss.Inspect(lvWatches.Selected.Caption);
+end;
+
 procedure TWatchesDlg.actDisableSelectedExecute(Sender: TObject);
 var
   n: Integer;