diff --git a/apps/tree.c b/apps/tree.c
index 80132449e9..4556d86c53 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -63,6 +63,7 @@
 #include "dircache.h"
 #include "tagcache.h"
 #include "yesno.h"
+#include "gwps-common.h"
 
 /* gui api */
 #include "list.h"
@@ -643,6 +644,8 @@ static bool dirbrowse(void)
                     /* Stop the music if it is playing */
                     if(audio_status()) {
                         if (!global_settings.party_mode)
+                            if (global_settings.fade_on_stop)
+                                fade(0);
                             audio_stop();
                     }
 #if defined(CONFIG_CHARGING) && \
diff --git a/docs/CREDITS b/docs/CREDITS
index 2e51aad85d..b0c6dc2dd2 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -207,3 +207,4 @@ Ewan Davies
 Frédéric François
 Marc-André Moreau
 Ioannis Koutoulakis
+Alistair Marshall