diff --git a/src/Menus.cpp b/src/Menus.cpp
index ec6297517..0a600b39f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -635,9 +635,6 @@ void AudacityProject::CreateMenusAndCommands()
       c->AddItem(wxT("SelRestore"), _("Retrieve Selectio&n"), FN(OnSelectionRestore),
          TracksExistFlag,
          TracksExistFlag);
-      c->AddSeparator();
-      // GA: Likewise zero crossings can be just the cursor, so this doesn't belong here. 
-      c->AddItem(wxT("ZeroCross"), _("Ends to &Zero Crossings"), FN(OnZeroCrossing), wxT("Z"));
 
       c->EndSubMenu();
 
@@ -672,6 +669,7 @@ void AudacityProject::CreateMenusAndCommands()
       c->EndSubMenu();
       /////////////////////////////////////////////////////////////////////////////
 
+      c->AddSeparator();
 
       c->AddItem(wxT("SelCursorStoredCursor"), _("Cursor to Stored &Cursor Position"), FN(OnSelectCursorStoredCursor),
          wxT(""), TracksExistFlag, TracksExistFlag);
@@ -682,6 +680,9 @@ void AudacityProject::CreateMenusAndCommands()
       // Save cursor position is used in some selections.
       // Maybe there should be a restore for it?
 
+      c->AddSeparator();
+
+      c->AddItem(wxT("ZeroCross"), _("At &Zero Crossings"), FN(OnZeroCrossing), wxT("Z"));
 
       c->EndMenu();
 
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 8833165ee..249602101 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -4595,7 +4595,7 @@ bool TrackPanel::IsSampleEditingPossible( wxMouseEvent &event, const WaveTrack *
 
    if (WaveTrack::Waveform != display)
    {
-      wxMessageBox(_("To use Draw, choose 'Waveform' in the Track Drop-down Menu."), _("Draw Tool"));
+      wxMessageBox(_("To use Draw, choose 'Waveform' or 'Waveform (dB)' in the Track Dropdown Menu."), _("Draw Tool"));
       return false;
    }