diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index a8a20eb69..bab11d329 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -160,15 +160,15 @@ BEGIN
         BEGIN
             MENUITEM "Komplettiere Wort\tCtrl+Alt+Enter",   IDM_EDIT_COMPLETEWORD
             MENUITEM SEPARATOR
-            MENUITEM "Wort nach &links\tCtrl+Left",         CMD_CTRLLEFT
-            MENUITEM "Wort nach &rechts\tCtrl+Right",       CMD_CTRLRIGHT
+            MENUITEM "Wort nach &links\tCtrl+ ←",           CMD_CTRLLEFT
+            MENUITEM "Wort nach &rechts\tCtrl+ →",          CMD_CTRLRIGHT
             MENUITEM "&Lösche linkes Wort\tCtrl+Back",      CMD_CTRLBACK
             MENUITEM "Lösche rechtes &Wort\tCtrl+Del",      CMD_CTRLDEL
-        END
+            END
         POPUP "&Zeilen"
         BEGIN
-            MENUITEM "&Hoch schieben\tCtrl+Shift+Up",            IDM_EDIT_MOVELINEUP
-            MENUITEM "&Runter schieben\tCtrl+Shift+Down",        IDM_EDIT_MOVELINEDOWN
+            MENUITEM "&Hoch schieben\tAlt+ ↑",                   IDM_EDIT_MOVELINEUP
+            MENUITEM "&Runter schieben\tAlt+ ↓",                 IDM_EDIT_MOVELINEDOWN
             MENUITEM SEPARATOR
             MENUITEM "Selekt&ion oder aktuelle Zeile ausschneiden\tCtrl+X", IDM_EDIT_CUT
             MENUITEM "Ganze &Zeilen ausschneiden\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
         MENUITEM "Zeilen &Nummern\tCtrl+Shift+N",           IDM_VIEW_LINENUMBERS
         MENUITEM "&Selektionsrand\tCtrl+Shift+M",           IDM_VIEW_MARGIN
         MENUITEM SEPARATOR
+        POPUP "Code &Faltung"
+        BEGIN
+            MENUITEM "&Aktiviere Faltung",                      IDM_VIEW_FOLDING
+            MENUITEM "Alle Falten &Umschalten\tCtrl+Shift+F",   IDM_VIEW_TOGGLEFOLDS
+            MENUITEM SEPARATOR
+            MENUITEM "Gehe zur &Nächsten\tAlt+ +",              CMD_FOLDJUMPDOWN
+            MENUITEM "Gehe zur &Vorherigen\tAlt+ –",            CMD_FOLDJUMPUP
+            MENUITEM SEPARATOR
+            MENUITEM "Falte &Einklappen\tAlt+ ←",               CMD_FOLDCOLLAPSE
+            MENUITEM "Falte &Ausklappen\tAlt+ →",               CMD_FOLDEXPAND
+        END
         POPUP "&Anzeigen"
         BEGIN
-            MENUITEM "&Code Faltung",                           IDM_VIEW_FOLDING
-            MENUITEM "Code Faltung &Umschalten\tCtrl+Shift+F",  IDM_VIEW_TOGGLEFOLDS
             MENUITEM "Fokussierte Ansicht\tCtrl+Alt+V",         IDM_VIEW_TOGGLE_VIEW
             MENUITEM "Logfile &Monitoring",                     IDM_VIEW_CHASING_DOCTAIL
             MENUITEM "&Erweiterte Dokument Ende Ansicht",       IDM_VIEW_SCROLLPASTEOF
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index bee1a0063..02c419d9b 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -160,15 +160,15 @@ BEGIN
         BEGIN
             MENUITEM "&Complete Word\tCtrl+Alt+Enter",      IDM_EDIT_COMPLETEWORD
             MENUITEM SEPARATOR
-            MENUITEM "Cursor Word &Left\tCtrl+Left",        CMD_CTRLLEFT
-            MENUITEM "Cursor Word &Right\tCtrl+Right",      CMD_CTRLRIGHT
+            MENUITEM "Cursor Word &Left\tCtrl+ ←",          CMD_CTRLLEFT
+            MENUITEM "Cursor Word &Right\tCtrl+ →",         CMD_CTRLRIGHT
             MENUITEM "&Delete Word Left\tCtrl+Back",        CMD_CTRLBACK
             MENUITEM "Delete &Word Right\tCtrl+Del",        CMD_CTRLDEL
         END
         POPUP "&Lines"
         BEGIN
-            MENUITEM "Move &Up\tCtrl+Shift+Up",             IDM_EDIT_MOVELINEUP
-            MENUITEM "&Move Down\tCtrl+Shift+Down",         IDM_EDIT_MOVELINEDOWN
+            MENUITEM "Move &Up\tAlt+ ↑",                    IDM_EDIT_MOVELINEUP
+            MENUITEM "&Move Down\tAlt+ ↓",                  IDM_EDIT_MOVELINEDOWN
             MENUITEM SEPARATOR
             MENUITEM "Cut Select&ion or Current Line\tCtrl+X",      IDM_EDIT_CUT
             MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X",  IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
         MENUITEM "Line &Numbers\tCtrl+Shift+N",         IDM_VIEW_LINENUMBERS
         MENUITEM "Selection &Margin\tCtrl+Shift+M",     IDM_VIEW_MARGIN
         MENUITEM SEPARATOR
-        POPUP "&Display"
+        POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
             MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM SEPARATOR
+            MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
+            MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
+            MENUITEM SEPARATOR
+            MENUITEM "&Collapse Fold\tAlt+ ←",          CMD_FOLDCOLLAPSE
+            MENUITEM "&Expand Fold\tAlt+ →",            CMD_FOLDEXPAND
+        END
+        POPUP "&Display"
+        BEGIN
             MENUITEM "Focused View\tCtrl+Alt+V",        IDM_VIEW_TOGGLE_VIEW
             MENUITEM "&Monitoring Log",                 IDM_VIEW_CHASING_DOCTAIL
             MENUITEM "&Scroll Past End of File",        IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
         END
         POPUP "&Zoom"
         BEGIN
-            MENUITEM "Zoom &In\tCtrl++",            IDM_VIEW_ZOOMIN
-            MENUITEM "Zoom &Out\tCtrl+-",           IDM_VIEW_ZOOMOUT
+            MENUITEM "Zoom &In\tCtrl+ +",            IDM_VIEW_ZOOMIN
+            MENUITEM "Zoom &Out\tCtrl+ –",           IDM_VIEW_ZOOMOUT
             MENUITEM "Reset &Zoom\tCtrl+0",         IDM_VIEW_RESETZOOM
         END
         POPUP "&Position"
diff --git a/src/Notepad3.c b/src/Notepad3.c
index aadb8313a..c98379f80 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -3316,12 +3316,16 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
   EnableCmd(hmenu, IDM_VIEW_CURRENTSCHEME, !IsWindow(Globals.hwndDlgCustomizeSchemes));
 
   EnableCmd(hmenu, IDM_VIEW_FOLDING, FocusedView.CodeFoldingAvailable && !FocusedView.HideNonMatchedLines);
-  CheckCmd(hmenu, IDM_VIEW_FOLDING, (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
-  EnableCmd(hmenu,IDM_VIEW_TOGGLEFOLDS,!te && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
-
+  bool const fd = (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding);
+  CheckCmd(hmenu, IDM_VIEW_FOLDING, fd);
+  EnableCmd(hmenu,IDM_VIEW_TOGGLEFOLDS, !te && fd);
+  EnableCmd(hmenu, CMD_FOLDJUMPDOWN, !te && fd);
+  EnableCmd(hmenu, CMD_FOLDJUMPUP, !te && fd);
+  EnableCmd(hmenu, CMD_FOLDCOLLAPSE, !te && fd);
+  EnableCmd(hmenu, CMD_FOLDEXPAND, !te && fd);
   bool const bF = (SC_FOLDLEVELBASE < (SciCall_GetFoldLevel(iCurLine) & SC_FOLDLEVELNUMBERMASK));
   bool const bH = (SciCall_GetFoldLevel(iCurLine) & SC_FOLDLEVELHEADERFLAG);
-  EnableCmd(hmenu,IDM_VIEW_TOGGLE_CURRENT_FOLD, !te && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding) && (bF || bH));
+  EnableCmd(hmenu,IDM_VIEW_TOGGLE_CURRENT_FOLD, !te && fd && (bF || bH));
 
   CheckCmd(hmenu,IDM_VIEW_USE2NDDEFAULT,Style_GetUse2ndDefault());