diff --git a/debugger/watchesdlg.pp b/debugger/watchesdlg.pp
index 37d93ef442..c2fab9b941 100644
--- a/debugger/watchesdlg.pp
+++ b/debugger/watchesdlg.pp
@@ -499,7 +499,8 @@ end;
 procedure TWatchesDlg.ContextChanged(Sender: TObject);
 begin
   DebugLn(DBG_DATA_MONITORS, ['DebugDataWindow: TWatchesDlg.ContextChanged ',  DbgSName(Sender), '  Upd:', IsUpdating]);
-  UpdateAll;
+  if (DebugBoss <> nil) and (DebugBoss.State in [dsPause, dsInternalPause]) then
+    UpdateAll;
 end;
 
 procedure TWatchesDlg.actEnableSelectedExecute(Sender: TObject);