diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index fdd2efc964..b55cc7fa92 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -1197,11 +1197,13 @@ void menu_input_pointer_close_messagebox(struct menu_state *menu_st)
       label = list->list[list->size - 1].label;
       /* Play sound for closing the info box */
 #ifdef HAVE_AUDIOMIXER
-      settings_t *settings          = config_get_ptr();
-      bool        audio_enable_menu = settings->bools.audio_enable_menu;
-      bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
-      if (audio_enable_menu && audio_enable_menu_notice)
-         audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_NOTICE_BACK);
+      {
+         settings_t *settings          = config_get_ptr();
+         bool        audio_enable_menu = settings->bools.audio_enable_menu;
+         bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
+         if (audio_enable_menu && audio_enable_menu_notice)
+            audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_NOTICE_BACK);
+      }
 #endif
    }
 
@@ -7874,11 +7876,13 @@ static int generic_menu_iterate(
       menu_st->selection_ptr   = selection;
       /* Play sound for closing the info box */
 #ifdef HAVE_AUDIOMIXER
-      bool        audio_enable_menu = settings->bools.audio_enable_menu;
-      bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
-      if (audio_enable_menu && audio_enable_menu_notice && 
-            string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFO_SCREEN)))
-         audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_NOTICE_BACK);
+      {
+         bool        audio_enable_menu = settings->bools.audio_enable_menu;
+         bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
+         if (audio_enable_menu && audio_enable_menu_notice && 
+               string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFO_SCREEN)))
+            audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_NOTICE_BACK);
+      }
 #endif
    }
 
@@ -7997,11 +8001,11 @@ int generic_menu_entry_action(
          {
             if (selection_buf_size > 0)
             {
+               unsigned scroll_speed  = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 10);
 #ifdef HAVE_AUDIOMIXER
                if (menu_st->selection_ptr != 0)
                   audio_driver_mixer_play_scroll_sound(false);
 #endif
-               unsigned scroll_speed  = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 10);
                if (!(menu_st->selection_ptr == 0 && !wraparound_enable))
                {
                   size_t idx             = 0;
@@ -8046,11 +8050,11 @@ int generic_menu_entry_action(
          {
             if (selection_buf_size > 0)
             {
+               unsigned scroll_speed  = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 10);
 #ifdef HAVE_AUDIOMIXER
                if (menu_st->selection_ptr != menu_entries_get_size() - 1)
                   audio_driver_mixer_play_scroll_sound(false);
 #endif
-               unsigned scroll_speed  = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 10);
                if (!(menu_st->selection_ptr >= selection_buf_size - 1
                      && !wraparound_enable))
                {