diff --git a/debugger/registersdlg.lfm b/debugger/registersdlg.lfm
index 319b4dd588..497ccd2e72 100644
--- a/debugger/registersdlg.lfm
+++ b/debugger/registersdlg.lfm
@@ -1,7 +1,7 @@
 inherited RegistersDlg: TRegistersDlg
-  Left = 359
+  Left = 342
   Height = 253
-  Top = 126
+  Top = 117
   Width = 346
   ActiveControl = lvRegisters
   Caption = 'Registers'
diff --git a/debugger/registersdlg.lrs b/debugger/registersdlg.lrs
index 10f3b25c67..098048d624 100644
--- a/debugger/registersdlg.lrs
+++ b/debugger/registersdlg.lrs
@@ -12,8 +12,8 @@ LazarusResources.Add('TLocalsDlg','FORMDATA',[
 ]);
 
 LazarusResources.Add('TRegistersDlg','FORMDATA',[
-  'TPF0'#241#13'TRegistersDlg'#12'RegistersDlg'#4'Left'#3'g'#1#6'Height'#3#253#0
-  +#3'Top'#2'~'#5'Width'#3'Z'#1#13'ActiveControl'#7#11'lvRegisters'#7'Caption'#6
+  'TPF0'#241#13'TRegistersDlg'#12'RegistersDlg'#4'Left'#3'V'#1#6'Height'#3#253#0
+  +#3'Top'#2'u'#5'Width'#3'Z'#1#13'ActiveControl'#7#11'lvRegisters'#7'Caption'#6
   +#9'Registers'#12'ClientHeight'#3#253#0#11'ClientWidth'#3'Z'#1#0#242#2#0#9'TL'
   +'istView'#11'lvRegisters'#6'Height'#3#253#0#5'Width'#3'Z'#1#5'Align'#7#8'alC'
   +'lient'#7'Columns'#14#1#7'Caption'#6#4'Name'#5'Width'#3#150#0#0#1#7'Caption'
diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas
index 5ef8456ca4..0ad3b5a80e 100644
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@@ -284,6 +284,7 @@ type
     procedure RegistersChanged(Sender: TObject);
     procedure SetMaster(const AMaster: TDBGRegisters);
   protected
+    function GetModified(const AnIndex: Integer): Boolean; override;
     function GetName(const AnIndex: Integer): String; override;
     function GetValue(const AnIndex: Integer): String; override;
   public
@@ -523,6 +524,13 @@ begin
   then NotifyChange;
 end;
 
+function TManagedRegisters.GetModified(const AnIndex: Integer): Boolean;
+begin
+  if Master = nil
+  then Result := inherited GetModified(AnIndex)
+  else Result := Master.Modified[AnIndex];
+end;
+
 function TManagedRegisters.GetName(const AnIndex: Integer): String;
 begin
   if Master = nil