diff --git a/src/menu/menu.c b/src/menu/menu.c
index 2ec04545..479d9cfd 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -119,8 +119,9 @@ static void menu_init (boot_params_t *boot_params) {
         __boot_tvtype = TV_NTSC;
     }
 
+    sound_init_sfx();
     if (menu->settings.sound_enabled) {
-        sound_init_sfx();
+        sound_use_sfx(true);
     }
 
     display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);
diff --git a/src/menu/sound.c b/src/menu/sound.c
index bf950d6c..98d62748 100644
--- a/src/menu/sound.c
+++ b/src/menu/sound.c
@@ -50,6 +50,14 @@ void sound_init_sfx (void) {
     sfx_enabled = true;
 }
 
+void sound_use_sfx(bool state) {
+    if (state) {
+        sfx_enabled = true;
+    }
+    else {
+        sfx_enabled = false;
+    }
+}
 
 void sound_play_effect(sound_effect_t sfx) {
     if(sfx_enabled) {
diff --git a/src/menu/sound.h b/src/menu/sound.h
index cf311519..8752a9b9 100644
--- a/src/menu/sound.h
+++ b/src/menu/sound.h
@@ -7,6 +7,7 @@
 #ifndef SOUND_H__
 #define SOUND_H__
 
+#include <stdbool.h>
 
 #define SOUND_MP3_PLAYER_CHANNEL    (0)
 #define SOUND_SFX_CHANNEL           (2)
@@ -23,6 +24,7 @@ typedef enum {
 void sound_init_default (void);
 void sound_init_mp3_playback (void);
 void sound_init_sfx (void);
+void sound_use_sfx(bool);
 void sound_play_effect(sound_effect_t sfx);
 void sound_deinit (void);
 void sound_poll (void);
diff --git a/src/menu/views/settings_editor.c b/src/menu/views/settings_editor.c
index 4dc2539c..22e3ac30 100644
--- a/src/menu/views/settings_editor.c
+++ b/src/menu/views/settings_editor.c
@@ -30,6 +30,7 @@ static void set_use_saves_folder_type (menu_t *menu, void *arg) {
 
 static void set_sound_enabled_type (menu_t *menu, void *arg) {
     menu->settings.sound_enabled = (bool) (arg);
+    sound_use_sfx(menu->settings.sound_enabled);
     settings_save(&menu->settings);
 }
 
@@ -134,19 +135,19 @@ static void draw (menu_t *menu, surface_t *d) {
     component_main_text_draw(
         ALIGN_LEFT, VALIGN_TOP,
         "\n\n"
-        "     Default Directory : %s\n\n"
-        "To change the menu settings, press 'A'.\n\n"
-        "     PAL60 Mode        : %s\n"
+        "  Default Directory : %s\n\n"
+        "To change the following menu settings, press 'A':\n"
+        "*    PAL60 Mode        : %s\n"
         "     Show Hidden Files : %s\n"
         "     Use Saves folder  : %s\n"
-        "*    Sound Effects     : %s\n"
+        "     Sound Effects     : %s\n"
 #ifdef BETA_SETTINGS
         "     Background Music  : %s\n"
         "     Rumble Feedback   : %s\n"
 #endif
-        "\n\n"
         "Note: Certain settings have the following caveats:\n\n"
         "*    Requires a flashcart reboot.\n",
+        "\n",
         menu->settings.default_directory,
         format_switch(menu->settings.pal60_enabled),
         format_switch(menu->settings.show_protected_entries),