1 files changed, 10 insertions, 4 deletions

diff --git a/apps/tree.c b/apps/tree.c
index 7fcced92c8..e35f769a14 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -967,11 +967,17 @@ int rockbox_browse(struct browse_context *browse)
     if (*tc.dirfilter >= NUM_FILTER_MODES)
     {
         int last_context;
+        /* don't reset if its the same browse already loaded */
+        if (tc.browse != browse ||
+            !(tc.currdir[1] && strcmp(tc.currdir, browse->root) == 0))
+        {
+            tc.browse = browse;
+            tc.selected_item = 0;
+            tc.dirlevel = 0;
+
+            strlcpy(tc.currdir, browse->root, sizeof(tc.currdir));
+        }
 
-        tc.browse = browse;
-        tc.selected_item = 0;
-        tc.dirlevel = 0;
-        strlcpy(tc.currdir, browse->root, sizeof(tc.currdir));
         start_wps = false;
         last_context = curr_context;