diff --git a/misc/mc.keymap.default b/misc/mc.keymap.default
index 6c29f9f2b..decb966d4 100644
--- a/misc/mc.keymap.default
+++ b/misc/mc.keymap.default
@@ -58,8 +58,8 @@ EditBeginningOfTextHighlight = ctrl-shift-home
 EditEndOfTextHighlight  = ctrl-shift-end
 EditBeginPageHighlight  = ctrl-shift-pgup
 EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight =
-EditScrollDownHighlight =
+EditScrollUpHighlight = ctrl-shift-up
+EditScrollDownHighlight = ctrl-shift-down
 EditParagraphUpHighlight =
 EditParagraphDownHighlight =
 
@@ -156,13 +156,13 @@ SelectCodepage = alt-e
 
 [viewer]
 ViewSearch = question; slash; f7
-ViewContinueSearch = ctrl-r; ctrl-s; f17
-ViewMoveToBol = home
-ViewMoveToEol = end
+ViewContinueSearch = ctrl-r; ctrl-s; f17; n
+ViewMoveToBol = ctrl-a
+ViewMoveToEol = ctrl-e
 ViewMoveLeft = h; left
 ViewMoveRight = l; right
 ViewMoveUp = k; y; insert; up
-ViewMoveDown = j; e; delete; down
+ViewMoveDown = j; e; delete; down; enter
 ViewMovePgDn = f; space; pgdn
 ViewMovePgUp = b; pgup
 ViewMoveHalfPgDn = d
@@ -171,7 +171,7 @@ ViewGotoBookmark = m
 ViewNewBookmark = r
 ViewNextFile = ctrl-f
 ViewPrevFile = ctrl-b
-ViewQuit = q; esc
+ViewQuit = q; esc; ctrl-g
 SelectCodepage = alt-e
 ShowCommandLine = ctrl-o
 ViewToggleRuler = alt-r
@@ -196,7 +196,7 @@ CmdMkdir = f7
 CmdDelete = f8
 CmdQuit = f10
 CmdMenuLastSelected = f19
-CmdQuietQuit = f20
+CmdQuietQuit = f20; ctrl-g
 CmdFind = alt-question
 CmdQuickCd = alt-c
 CmdQuickChdir = ctrl-backslash
diff --git a/src/keybind.c b/src/keybind.c
index f82df730c..a7def2017 100644
--- a/src/keybind.c
+++ b/src/keybind.c
@@ -404,10 +404,11 @@ const global_keymap_t default_viewer_keymap[] = {
     { XCTRL ('r'), CK_ViewContinueSearch, "C-r" },
     { XCTRL ('s'), CK_ViewContinueSearch, "C-s" },
     { KEY_F (17),  CK_ViewContinueSearch, "S-F7" },
+    { 'n',         CK_ViewContinueSearch, "n" },
     { ALT ('r'),   CK_ViewToggleRuler,    "M-r" },
 
-    { KEY_HOME,    CK_ViewMoveToBol,      "Home" },
-    { KEY_END,     CK_ViewMoveToEol,      "End" },
+    { XCTRL ('a'), CK_ViewMoveToBol,      "C-a" },
+    { XCTRL ('e'), CK_ViewMoveToEol,      "C-e" },
 
     { 'h',         CK_ViewMoveLeft,       "h" },
     { KEY_LEFT,    CK_ViewMoveLeft,       "Left" },