diff --git a/apps/onplay.c b/apps/onplay.c
index 091680e949..f44d339246 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -69,6 +69,7 @@ static int context;
 static const char *selected_file = NULL;
 static int selected_file_attr = 0;
 static int onplay_result = ONPLAY_OK;
+extern struct menu_item_ex file_menu; /* settings_menu.c  */
 
 /* redefine MAKE_MENU so the MENU_EXITAFTERTHISMENU flag can be added easily */
 #define MAKE_ONPLAYMENU( name, str, callback, icon, ... )               \
@@ -1397,7 +1398,7 @@ MAKE_ONPLAYMENU( tree_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
 #ifdef HAVE_RECORDING
            &set_recdir_item,
 #endif
-           &set_startdir_item, &add_to_faves_item,
+           &set_startdir_item, &add_to_faves_item, &file_menu,
          );
 static int onplaymenu_callback(int action,const struct menu_item_ex *this_item)
 {
diff --git a/apps/tree.c b/apps/tree.c
index 938e44d350..8efccf5549 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -359,6 +359,7 @@ static int update_dir(void)
     else 
 #endif
     {
+        tc.sort_dir = global_settings.sort_dir;
         /* if the tc.currdir has been changed, reload it ...*/
         if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir)
         {