diff --git a/ide/projectopts.pp b/ide/projectopts.pp
index 0a9a2c9333..774355675a 100644
--- a/ide/projectopts.pp
+++ b/ide/projectopts.pp
@@ -160,6 +160,7 @@ begin
     Top:= Self.ClientHeight - Height - 4;
     Kind:= bkCancel;
     Anchors:= [akBottom, akRight];
+    Cancel:= true;
   end;
 
   OkButton:=TBitBtn.Create(Self);
@@ -169,6 +170,7 @@ begin
     Top:= CancelButton.Top;
     Kind:= bkOk;
     Anchors:= [akBottom, akRight];
+    Default:= true;
   end;
 
   IDEDialogLayoutList.ApplyLayout(Self, 430, 375);
diff --git a/ideintf/imagelisteditor.pp b/ideintf/imagelisteditor.pp
index e909eb2bad..26651a4a0c 100644
--- a/ideintf/imagelisteditor.pp
+++ b/ideintf/imagelisteditor.pp
@@ -159,7 +159,6 @@ end;
 //Select new image file and add in list
 procedure TImageListEditorDlg.OnClickAdd(Sender: TObject);
 Var OpenDlg: TOpenDialog;
-    FileName: String;
     i      : Integer;
 begin
  Opendlg := TOpenDialog.Create(Self);
@@ -172,7 +171,6 @@ begin
    If OpenDlg.Execute then
    begin
      fDirName:=ExtractFilePath(OpenDlg.FileName); //save the directory
-     FileName:=OpenDlg.FileName;
      for i := 0 to OpenDlg.Files.Count - 1 do
        AddImageToList(OpenDlg.Files[i]);
    end;