diff --git a/components/todolist/todolist.lfm b/components/todolist/todolist.lfm
index e06b57375b..2f2a7369fd 100644
--- a/components/todolist/todolist.lfm
+++ b/components/todolist/todolist.lfm
@@ -69,6 +69,7 @@ object IDETodoWindow: TIDETodoWindow
     OnClick = lvTodoClick
     OnCompare = lvTodoCompare
     OnEnter = lvTodoEnter
+    OnKeyDown = lvTodoKeyDown
     OnSelectItem = lvTodoSelectItem
   end
   object ToolBar: TToolBar
@@ -276,6 +277,10 @@ object IDETodoWindow: TIDETodoWindow
     Top = 152
     object acEdit: TAction
       Caption = 'Edit'
+      SecondaryShortCuts.Strings = (
+        'Alt+Enter'
+      )
+      ShortCut = 113
       OnExecute = acEditExecute
     end
     object acGoto: TAction
@@ -284,6 +289,7 @@ object IDETodoWindow: TIDETodoWindow
     end
     object acRefresh: TAction
       Caption = 'Refresh'
+      ShortCut = 116
       OnExecute = acRefreshExecute
     end
     object acExport: TAction
diff --git a/components/todolist/todolist.pas b/components/todolist/todolist.pas
index 834bc22991..72c30ceba9 100644
--- a/components/todolist/todolist.pas
+++ b/components/todolist/todolist.pas
@@ -124,6 +124,7 @@ type
     procedure lvTodoCompare(Sender : TObject; Item1, Item2 : TListItem;
       {%H-}Data : Integer; var Compare : Integer);
     procedure lvTodoEnter(Sender: TObject);
+    procedure lvTodoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure lvTodoSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean);
     procedure SaveDialogShow(Sender: TObject);
     procedure XMLPropStorageRestoreProperties(Sender: TObject);
@@ -334,6 +335,15 @@ begin
   acGoto.Enabled := acEdit.Enabled;
 end;
 
+procedure TIDETodoWindow.lvTodoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+  if (Key = VK_RETURN) and (Shift = []) then
+  begin
+    acGotoExecute(Sender);
+    Key := 0;
+  end;
+end;
+
 procedure TIDETodoWindow.lvTodoSelectItem(Sender: TObject; Item: TListItem;
   Selected: Boolean);
 begin
@@ -425,6 +435,7 @@ begin
 
   Caption := lisToDoList;
 
+  acEdit.Hint := lisTodolistEdit;
   acRefresh.Hint := lisTodolistRefresh;
   acGoto.Hint := listodoListGotoLine;
   acExport.Hint := rsExportTodoIt;
diff --git a/components/todolist/todoliststrconsts.pas b/components/todolist/todoliststrconsts.pas
index 31868c081d..127c4ebf16 100644
--- a/components/todolist/todoliststrconsts.pas
+++ b/components/todolist/todoliststrconsts.pas
@@ -28,6 +28,7 @@ const
   csvHeader = 'Type,Description,Priority,Module,Line,Owner,Category';
 
 resourcestring
+  lisTodolistEdit='Edit selected item';
   lisTodolistRefresh='Refresh todo items';
   lisTodoListGotoLine='Goto selected source line';
   lisCTInsertMacro = 'Insert Macro';