diff --git a/components/codetools/sourcechanger.pas b/components/codetools/sourcechanger.pas
index 93743771bf..d418395549 100644
--- a/components/codetools/sourcechanger.pas
+++ b/components/codetools/sourcechanger.pas
@@ -347,9 +347,6 @@ const
   CreateCodeLocationNames: array[TCreateCodeLocation] of ShortString = (
     'Local', 'Class'
     );
-  CreateCodeLocationAmpNames: array[TCreateCodeLocation] of ShortString = (
-    '&Local', '&Class'
-    );
 
   ForwardProcBodyInsertPolicyNames: array[TForwardProcBodyInsertPolicy] of
     shortstring = (
diff --git a/ide/codecreationdlg.lfm b/ide/codecreationdlg.lfm
index ca592a4756..b77965c73b 100644
--- a/ide/codecreationdlg.lfm
+++ b/ide/codecreationdlg.lfm
@@ -10,6 +10,7 @@ object CodeCreationDialog: TCodeCreationDialog
   KeyPreview = True
   OnKeyPress = FormKeyPress
   Position = poScreenCenter
+  ShowHint = True
   LCLVersion = '1.7'
   object ButtonPanel: TButtonPanel
     Left = 6
diff --git a/ide/codecreationdlg.pas b/ide/codecreationdlg.pas
index f83ff7ef3e..3d018edd97 100644
--- a/ide/codecreationdlg.pas
+++ b/ide/codecreationdlg.pas
@@ -91,19 +91,20 @@ end;
 procedure TCodeCreationDialog.DoCreate;
 var
   S: TInsertClassSection;
-  L: TCreateCodeLocation;
 begin
   inherited DoCreate;
 
   KeyPreview := True;
 
+  Hint := lisYouCanSelectItemsBySimplyPressingUnderscoredLetter;
+
   SectionRadioGroup.Items.Clear;
   for S := Low(TInsertClassSection) to High(TInsertClassSection) do
     SectionRadioGroup.Items.Add(InsertClassSectionAmpNames[S]);
 
   LocationRadioGroup.Items.Clear;
-  for L := Low(TCreateCodeLocation) to High(TCreateCodeLocation) do
-    LocationRadioGroup.Items.Add(CreateCodeLocationAmpNames[L]);
+  LocationRadioGroup.Items.Add(lisLocal);
+  LocationRadioGroup.Items.Add(lisClass);
 end;
 
 procedure TCodeCreationDialog.DoShow;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index f7c544d722..3451aab9cf 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -3667,6 +3667,10 @@ resourcestring
   //codetools ChooseClassSectionDlg
   lisCodeCreationDialogCaption = 'Code creation options';
   lisCodeCreationDialogLocation = 'Location';
+  lisLocal = '&Local';
+  lisClass = '&Class';
+  lisYouCanSelectItemsBySimplyPressingUnderscoredLetter = 'You can select '
+    +'items by simply pressing underscored letters';
   lisCodeCreationDialogClassSection = 'Class section';
 
   // diff dialog