diff --git a/source/core/menu/menu.cpp b/source/core/menu/menu.cpp
index 6a7f2cf4b..500255014 100644
--- a/source/core/menu/menu.cpp
+++ b/source/core/menu/menu.cpp
@@ -375,7 +375,7 @@ void M_StartControlPanel (bool makeSound)
 	}
 	GSnd->SetSfxPaused(true, PAUSESFX_MENU);
 	gi->MenuOpened();
-	if (makeSound) gi->MenuSound(ActivateSound);
+	if (makeSound) M_MenuSound(ActivateSound);
 
 	inputState.ClearAllInput();
 	for (int i = 0; i < NUM_MKEYS; ++i)
diff --git a/source/core/menu/messagebox.cpp b/source/core/menu/messagebox.cpp
index 02090ec02..48269fe58 100644
--- a/source/core/menu/messagebox.cpp
+++ b/source/core/menu/messagebox.cpp
@@ -360,7 +360,7 @@ bool DMessageBoxMenu::MouseEvent(int type, int x, int y)
 		}
 		if (sel != -1 && sel != messageSelection)
 		{
-			gi->MenuSound(CursorSound);
+			M_MenuSound(CursorSound);
 		}
 		messageSelection = sel;
 		if (type == MOUSE_Release)