diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index a9f75f4e39..a83a1477da 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -167,6 +167,9 @@ Menuset
 		OptItem "Open Inset|O" "next-inset-toggle open"
 		OptItem "Close Inset|C" "next-inset-toggle close"
 		Separator
+		Item "Open All Notes|A" "all-insets-toggle open note"
+		Item "Close All Notes|l" "all-insets-toggle close note"
+		Separator
 		Item "Dissolve Inset|D" "inset-dissolve"
 	End
 
diff --git a/status.16x b/status.16x
index 933e38ad10..8ba20b7146 100644
--- a/status.16x
+++ b/status.16x
@@ -103,6 +103,9 @@ What's new
 - Fix assertion when pressing down arrow in the command buffer while
   the history is empty (bug 6001).
 
+- Enhance notes context menu for toggling all notes.
+
+
 * DOCUMENTATION AND LOCALIZATION
 
 - Fix icon image files so that they appear correctly when the