diff --git a/source/optimizetables.dfm b/source/optimizetables.dfm
index 8859e484..3162f0b7 100644
--- a/source/optimizetables.dfm
+++ b/source/optimizetables.dfm
@@ -58,9 +58,9 @@ object optimize: Toptimize
     OnChange = DBComboBoxChange
   end
   object btnClose: TButton
-    Left = 326
-    Top = 378
-    Width = 99
+    Left = 348
+    Top = 376
+    Width = 75
     Height = 25
     Anchors = [akRight, akBottom]
     Cancel = True
@@ -92,6 +92,7 @@ object optimize: Toptimize
     Top = 50
     Width = 99
     Height = 25
+    HelpContext = 7
     Anchors = [akTop, akRight]
     Caption = 'Optimize'
     TabOrder = 3
@@ -130,8 +131,8 @@ object optimize: Toptimize
   object ListResults: TListView
     Left = 8
     Top = 230
-    Width = 417
-    Height = 142
+    Width = 415
+    Height = 140
     Anchors = [akLeft, akTop, akRight, akBottom]
     Columns = <>
     ColumnClick = False
@@ -180,7 +181,7 @@ object optimize: Toptimize
   object cbxExtendedCheck: TCheckBox
     Left = 358
     Top = 108
-    Width = 70
+    Width = 65
     Height = 17
     Anchors = [akTop, akRight]
     Caption = 'Extended'
@@ -189,10 +190,20 @@ object optimize: Toptimize
   object cbxExtendedRepair: TCheckBox
     Left = 358
     Top = 188
-    Width = 70
+    Width = 65
     Height = 17
     Anchors = [akTop, akRight]
     Caption = 'Extended'
     TabOrder = 10
   end
+  object btnHelp: TButton
+    Left = 267
+    Top = 376
+    Width = 75
+    Height = 25
+    Anchors = [akRight, akBottom]
+    Caption = 'Help'
+    TabOrder = 13
+    OnClick = btnHelpClick
+  end
 end
diff --git a/source/optimizetables.pas b/source/optimizetables.pas
index f8c929df..5f8843ba 100644
--- a/source/optimizetables.pas
+++ b/source/optimizetables.pas
@@ -31,6 +31,7 @@ type
     tlbCheckAll: TToolButton;
     cbxExtendedCheck: TCheckBox;
     cbxExtendedRepair: TCheckBox;
+    btnHelp: TButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -42,6 +43,7 @@ type
     procedure Repair(Sender: TObject);
     procedure ClearResults;
     procedure AddResults(ds: TDataSet);
+    procedure btnHelpClick(Sender: TObject);
     procedure TablesCheckListBoxClickCheck(Sender: TObject);
     procedure RunIterated(pseudoSql: string);
     procedure ValidateControls;
@@ -287,6 +289,11 @@ begin
   ListResults.Items.EndUpdate;
 end;
 
+procedure Toptimize.btnHelpClick(Sender: TObject);
+begin
+  Mainform.Childwin.CallSQLHelpWithKeyword('OPTIMIZE');
+end;
+
 
 {**
   Table was (un-)checked: ensure correct state of buttons