diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas
index a4b286f261..43eee08c99 100644
--- a/ide/fpdoceditwindow.pas
+++ b/ide/fpdoceditwindow.pas
@@ -859,7 +859,8 @@ procedure TFPDocEditor.OnFPDocChanged(Sender: TObject;
   FPDocFPFile: TLazFPDocFile);
 begin
   if fpdefWriting in FFlags then exit;
-
+  if FPDocFPFile=nil then exit;
+  // maybe eventually update the editor
 end;
 
 procedure TFPDocEditor.LoadGUIValues(Element: TCodeHelpElement);
@@ -1033,7 +1034,7 @@ begin
   fpdiDescription:
     begin
       PageControl.ActivePage:=DescrTabSheet;
-
+      DescrMemo.CaretPos:=LineCol;
     end;
   fpdiErrors: PageControl.ActivePage:=ErrorsTabSheet;
   fpdiSeeAlso: PageControl.ActivePage:=SeeAlsoTabSheet;
diff --git a/ide/fpdocselectlink.lfm b/ide/fpdocselectlink.lfm
index 88b31c4ff5..065f4697af 100644
--- a/ide/fpdocselectlink.lfm
+++ b/ide/fpdocselectlink.lfm
@@ -9,7 +9,7 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
   ClientWidth = 408
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.5'
   object LinkLabel: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = TitleEdit
@@ -17,8 +17,8 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 18
-    Top = 69
+    Height = 15
+    Top = 64
     Width = 396
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
@@ -33,7 +33,7 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 18
+    Height = 15
     Top = 6
     Width = 396
     Anchors = [akTop, akLeft, akRight]
@@ -46,8 +46,8 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     AnchorSideTop.Control = LinkEdit
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 106
-    Top = 120
+    Height = 124
+    Top = 110
     Width = 396
     Align = alBottom
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -59,9 +59,17 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 44
-    Top = 232
+    Height = 36
+    Top = 240
     Width = 396
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
     TabOrder = 0
     ShowButtons = [pbOK, pbCancel]
   end
@@ -72,8 +80,8 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 27
-    Top = 93
+    Height = 25
+    Top = 85
     Width = 396
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -81,7 +89,6 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     BorderSpacing.Right = 6
     OnChange = LinkEditChange
     OnKeyDown = LinkEditKeyDown
-    OnUTF8KeyPress = LinkEditUTF8KeyPress
     ParentShowHint = False
     ShowHint = True
     TabOrder = 1
@@ -93,8 +100,8 @@ object FPDocLinkEditorDlg: TFPDocLinkEditorDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 27
-    Top = 30
+    Height = 25
+    Top = 27
     Width = 396
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
diff --git a/ide/fpdocselectlink.pas b/ide/fpdocselectlink.pas
index 567a436fd7..8e8205878b 100644
--- a/ide/fpdocselectlink.pas
+++ b/ide/fpdocselectlink.pas
@@ -99,14 +99,13 @@ type
     TitleLabel: TLabel;
     LinkEdit: TEdit;
     LinkLabel: TLabel;
-    procedure CompletionBoxMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
+    procedure CompletionBoxMouseDown(Sender: TObject; {%H-}Button: TMouseButton;
+      {%H-}Shift: TShiftState; {%H-}X, Y: Integer);
     procedure CompletionBoxPaint(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure LinkEditChange(Sender: TObject);
     procedure LinkEditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure LinkEditUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
   private
     FStartFPDocFile: TLazFPDocFile;
     fItems: TFPDocLinkCompletionList;
@@ -276,11 +275,6 @@ begin
   end;
 end;
 
-procedure TFPDocLinkEditorDlg.LinkEditUTF8KeyPress(Sender: TObject;
-  var UTF8Key: TUTF8Char);
-begin
-end;
-
 procedure TFPDocLinkEditorDlg.SetSourceFilename(const AValue: string);
 var
   Owners: TFPList;
diff --git a/ide/frames/codeobserver_options.pas b/ide/frames/codeobserver_options.pas
index 8d4e033f58..34d0ccc9d4 100644
--- a/ide/frames/codeobserver_options.pas
+++ b/ide/frames/codeobserver_options.pas
@@ -54,7 +54,7 @@ type
     FGroupCheckBoxes: array [TCEObserverCategoryGroup] of TCheckBox;
   public
     function GetTitle: String; override;
-    procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
+    procedure Setup({%H-}ADialog: TAbstractOptionsEditorDialog); override;
     procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
     procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
     class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;