diff --git a/source/main.dfm b/source/main.dfm
index 0be5d6ff..13465b87 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -2085,6 +2085,12 @@ object MainForm: TMainForm
       object Cut1: TMenuItem
         Action = actCut
       end
+      object Movelinedown1: TMenuItem
+        Action = actSynMoveDown
+      end
+      object Movelineup1: TMenuItem
+        Action = actSynMoveUp
+      end
       object N13: TMenuItem
         Caption = '-'
       end
@@ -3548,12 +3554,14 @@ object MainForm: TMainForm
     object actSynMoveDown: TAction
       Category = 'SQL'
       Caption = 'Move line down'
+      ImageIndex = 75
       ShortCut = 32808
       OnExecute = actSynMoveDownExecute
     end
     object actSynMoveUp: TAction
       Category = 'SQL'
       Caption = 'Move line up'
+      ImageIndex = 74
       ShortCut = 32806
       OnExecute = actSynMoveUpExecute
     end
diff --git a/source/main.pas b/source/main.pas
index 04c8fc5e..29322ddb 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -767,6 +767,8 @@ type
     actSynMoveUp: TAction;
     actCopyTabsToSpaces: TAction;
     Copywithtabstospaces1: TMenuItem;
+    Movelinedown1: TMenuItem;
+    Movelineup1: TMenuItem;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);
@@ -1892,9 +1894,9 @@ begin
     menuCopyAs.Add(CopyAsMenu);
   end;
 
+  // Generate submenu with SynEdit commands
   FEditorCommandStrings := TStringList.Create;
   SynEditKeyCmds.GetEditorCommandValues(AddEditorCommandMenu);
-
   for i:=0 to FEditorCommandStrings.Count-1 do begin
     EditorCommand := ConvertCodeStringToCommand(FEditorCommandStrings[i]);
     CommandMenu := TMenuItem.Create(MainMenu1);
@@ -1915,13 +1917,6 @@ begin
     CommandMenu.OnClick := EditorCommandOnClick;
     menuEditorCommands.Add(CommandMenu);
   end;
-  CommandMenu := TMenuItem.Create(MainMenu1);
-  CommandMenu.Action := actSynMoveDown;
-  menuEditorCommands.Add(CommandMenu);
-  CommandMenu := TMenuItem.Create(MainMenu1);
-  CommandMenu.Action := actSynMoveUp;
-  menuEditorCommands.Add(CommandMenu);
-
 
 
   Delimiter := AppSettings.ReadString(asDelimiter);
@@ -4740,6 +4735,8 @@ begin
     Editor.CaretY := Editor.CaretY + 1;
     // OnStatusChanged implicitly fired here
     Editor.Repaint;
+  end else begin
+    MessageBeep(MB_ICONERROR);
   end;
 end;
 
@@ -4754,6 +4751,8 @@ begin
     Editor.CaretY := Editor.CaretY - 1;
     // OnStatusChanged implicitly fired here
     Editor.Repaint;
+  end else begin
+    MessageBeep(MB_ICONERROR);
   end;
 end;