1 files changed, 9 insertions, 0 deletions

diff --git a/apps/filetree.c b/apps/filetree.c
index 42f13f39e7..eb429c83e3 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -287,12 +287,18 @@ static int compare(const void* p1, const void* p2)
 /* load and sort directory into the tree's cache. returns NULL on failure. */
 int ft_load(struct tree_context* c, const char* tempdir)
 {
+    if (c->out_of_tree > 0) /* something else is loaded */
+        return 0;
+
     int files_in_dir = 0;
     int name_buffer_used = 0;
     struct dirent *entry;
     bool (*callback_show_item)(char *, int, struct tree_context *) = NULL;
     DIR *dir;
 
+    if (!c->is_browsing)
+        c->browse = NULL;
+
     if (tempdir)
         dir = opendir(tempdir);
     else
@@ -760,6 +766,7 @@ int ft_enter(struct tree_context* c)
             }
         }
     }
+
     return rc;
 }
 
@@ -802,5 +809,7 @@ int ft_exit(struct tree_context* c)
     if (exit_func)
         rc = 3;
 
+    c->out_of_tree = 0;
+
     return rc;
 }