diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
index 0ae722700..d49453615 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -135,7 +135,6 @@ enum {
    OnChannelMonoID,
 
    OnMergeStereoID,
-   OnWaveColorID,
    OnInstrument1ID,
    OnInstrument2ID,
    OnInstrument3ID,
@@ -801,14 +800,14 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
       ) );
       if( hasWaveform ){
          POPUP_MENU_SEPARATOR()
-         POPUP_MENU_SUB_MENU(OnWaveColorID, XO("&Wave Color"), WaveColorMenuTable)
+         POPUP_MENU_SUB_MENU(XO("&Wave Color"), WaveColorMenuTable)
       }
    }
 
    POPUP_MENU_SEPARATOR()
-   POPUP_MENU_SUB_MENU(0, XO("&Format"), FormatMenuTable)
+   POPUP_MENU_SUB_MENU(XO("&Format"), FormatMenuTable)
    POPUP_MENU_SEPARATOR()
-   POPUP_MENU_SUB_MENU(0, XO("Rat&e"), RateMenuTable)
+   POPUP_MENU_SUB_MENU(XO("Rat&e"), RateMenuTable)
 END_POPUP_MENU()
 
 
diff --git a/src/widgets/PopupMenuTable.h b/src/widgets/PopupMenuTable.h
index 562324d08..9b1c6e06c 100644
--- a/src/widgets/PopupMenuTable.h
+++ b/src/widgets/PopupMenuTable.h
@@ -202,9 +202,9 @@ void HandlerClass::Populate() { \
    POPUP_MENU_APPEND_ITEM(Entry::CheckItem, id, string, memFn);
 
 // classname names a class that derives from MenuTable and defines Instance()
-#define POPUP_MENU_SUB_MENU(id, string, classname) \
+#define POPUP_MENU_SUB_MENU(string, classname) \
    POPUP_MENU_APPEND( \
-      Entry::SubMenu, id, string, nullptr, &classname::Instance() );
+      Entry::SubMenu, -1, string, nullptr, &classname::Instance() );
 
 #define POPUP_MENU_SEPARATOR() \
    POPUP_MENU_APPEND( \