diff --git a/debugger/watchpropertydlg.lfm b/debugger/watchpropertydlg.lfm
index 0340d5556a..ed270af8c3 100644
--- a/debugger/watchpropertydlg.lfm
+++ b/debugger/watchpropertydlg.lfm
@@ -1,19 +1,20 @@
 object WatchPropertyDlg: TWatchPropertyDlg
   Left = 513
-  Height = 270
+  Height = 281
   Top = 271
   Width = 428
+  AutoSize = True
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Watch Properties'
-  ClientHeight = 270
+  ClientHeight = 281
   ClientWidth = 428
   Constraints.MinWidth = 400
   Position = poScreenCenter
   LCLVersion = '1.9.0.0'
   object rgStyle: TRadioGroup
     Left = 6
-    Height = 92
+    Height = 102
     Top = 139
     Width = 416
     Align = alClient
@@ -30,7 +31,7 @@ object WatchPropertyDlg: TWatchPropertyDlg
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 3
-    ClientHeight = 65
+    ClientHeight = 87
     ClientWidth = 412
     Columns = 3
     ItemIndex = 7
@@ -49,8 +50,8 @@ object WatchPropertyDlg: TWatchPropertyDlg
   end
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 27
-    Top = 237
+    Height = 28
+    Top = 247
     Width = 416
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -83,9 +84,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideTop.Control = txtExpression
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 13
-      Width = 70
+      Height = 13
+      Top = 11
+      Width = 62
       BorderSpacing.Left = 6
       Caption = 'Expression:'
       ParentColor = False
@@ -95,10 +96,10 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideLeft.Side = asrBottom
       AnchorSideRight.Control = PanelTop
       AnchorSideRight.Side = asrBottom
-      Left = 82
-      Height = 29
+      Left = 74
+      Height = 23
       Top = 6
-      Width = 340
+      Width = 348
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -110,9 +111,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideTop.Control = txtRepCount
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 48
-      Width = 86
+      Height = 13
+      Top = 40
+      Width = 79
       BorderSpacing.Left = 6
       Caption = 'Repeat Count:'
       ParentColor = False
@@ -122,9 +123,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = txtExpression
       AnchorSideTop.Side = asrBottom
-      Left = 98
-      Height = 29
-      Top = 41
+      Left = 91
+      Height = 23
+      Top = 35
       Width = 60
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -136,9 +137,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = txtRepCount
       AnchorSideTop.Side = asrCenter
-      Left = 215
-      Height = 29
-      Top = 41
+      Left = 204
+      Height = 23
+      Top = 35
       Width = 60
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -150,10 +151,10 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = lblRepCount
       AnchorSideTop.Side = asrCenter
-      Left = 170
-      Height = 15
-      Top = 48
-      Width = 39
+      Left = 163
+      Height = 13
+      Top = 40
+      Width = 35
       BorderSpacing.Left = 12
       Caption = 'Digits:'
       ParentColor = False
@@ -162,9 +163,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideTop.Control = txtRepCount
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 20
-      Top = 73
-      Width = 77
+      Height = 24
+      Top = 61
+      Width = 70
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'Enabled'
@@ -175,9 +176,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideTop.Control = chkEnabled
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 20
-      Top = 93
-      Width = 147
+      Height = 24
+      Top = 85
+      Width = 134
       AllowGrayed = True
       Caption = 'Allow Function Calls'
       TabOrder = 4
@@ -187,9 +188,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
       AnchorSideTop.Control = chkAllowFunc
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 20
-      Top = 113
-      Width = 155
+      Height = 24
+      Top = 109
+      Width = 137
       BorderSpacing.Bottom = 6
       Caption = 'chkUseInstanceClass'
       TabOrder = 5
diff --git a/debugger/watchpropertydlg.pp b/debugger/watchpropertydlg.pp
index b89ac77a0c..8a3cb1db61 100644
--- a/debugger/watchpropertydlg.pp
+++ b/debugger/watchpropertydlg.pp
@@ -39,7 +39,7 @@ unit WatchPropertyDlg;
 interface
 
 uses
-  Classes, sysutils, Forms, StdCtrls, Extctrls, ButtonPanel, LazarusIDEStrConsts,
+  Classes, SysUtils, Forms, StdCtrls, Extctrls, ButtonPanel, LazarusIDEStrConsts,
   IDEHelpIntf, DbgIntfDebuggerBase, Debugger, BaseDebugManager, DebuggerStrConst;
 
 type