diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp
index e17f73bf1..0cc74b69d 100644
--- a/src/CommonCommandFlags.cpp
+++ b/src/CommonCommandFlags.cpp
@@ -95,8 +95,8 @@ static CommandFlagOptions result{
       // "\n\nClick the Help button to learn more about selection methods."
       );
 #endif
-      return format.Format( Name );
 #endif
+      return format.Format( Name );
    },
    "Selecting_Audio_-_the_basics",
    XO("No Audio Selected")
diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index 993d1b5c8..577f90e93 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -502,9 +502,12 @@ BaseItemSharedPtr HelpMenu()
          Command( wxT("QuickFix"), XXO("&Quick Fix..."), FN(OnQuickFix),
             AlwaysEnabledFlag ),
          // DA: 'Getting Started' rather than 'Quick Help'.
-         Command( wxT("QuickHelp"), XXO("&Getting Started"), FN(OnQuickHelp) ),
+         Command( wxT("QuickHelp"), XXO("&Getting Started"), FN(OnQuickHelp),
+            AlwaysEnabledFlag ),
          // DA: Emphasise it is the Audacity Manual (No separate DA manual).
-         Command( wxT("Manual"), XXO("Audacity &Manual"), FN(OnManual) )
+         Command( wxT("Manual"), XXO("Audacity &Manual"), FN(OnManual),
+            AlwaysEnabledFlag )
+
    #else
          Command( wxT("QuickHelp"), XXO("&Quick Help..."), FN(OnQuickHelp),
             AlwaysEnabledFlag ),