diff --git a/app/Console/Commands/SetupDevEnvironment.php b/app/Console/Commands/SetupDevEnvironment.php
index 1b0d826b..1e8a80e6 100644
--- a/app/Console/Commands/SetupDevEnvironment.php
+++ b/app/Console/Commands/SetupDevEnvironment.php
@@ -184,6 +184,7 @@ class SetupDevEnvironment extends Command
             ->create([
                 'type'         => 'folder',
                 'item_id'      => $shared_folder->id,
+                'user_id'      => $user->id,
                 'permission'   => 'editor',
                 'is_protected' => false,
                 'password'     => null,
@@ -318,6 +319,7 @@ class SetupDevEnvironment extends Command
             ->create([
                 'type'         => 'folder',
                 'item_id'      => $documents->id,
+                'user_id'      => $user->id,
                 'permission'   => 'editor',
                 'is_protected' => false,
                 'password'     => null,
@@ -722,7 +724,7 @@ class SetupDevEnvironment extends Command
             ],
             [
                 'name'  => 'app_favicon',
-                'value' => null,
+                'value' => 'system/favicon.png',
             ],
             [
                 'name'  => 'google_analytics',
@@ -764,7 +766,7 @@ class SetupDevEnvironment extends Command
         });
 
         // Get system images
-        collect(['logo.svg', 'logo-horizontal.svg'])
+        collect(['logo.svg', 'logo-horizontal.svg', 'favicon.png'])
             ->each(function ($file) {
                 \File::copy(storage_path("demo/app/$file"), storage_path("app/system/$file"));
             });
diff --git a/app/Http/Controllers/FileManager/BrowseController.php b/app/Http/Controllers/FileManager/BrowseController.php
index de7514b9..57d69ddc 100644
--- a/app/Http/Controllers/FileManager/BrowseController.php
+++ b/app/Http/Controllers/FileManager/BrowseController.php
@@ -105,8 +105,10 @@ class BrowseController extends Controller
         $files_trashed = File::onlyTrashed()
             ->with(['parent'])
             ->where('user_id', $user_id)
-            ->whereNull('folder_id')
-            ->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))))
+            ->where(function($query) use ($folders_trashed) {
+                $query->whereNull('folder_id');
+                $query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
+            })
             ->sortable()
             ->get();
 
diff --git a/storage/demo/app/favicon.png b/storage/demo/app/favicon.png
new file mode 100644
index 00000000..c0194446
Binary files /dev/null and b/storage/demo/app/favicon.png differ
diff --git a/tests/Feature/FileManager/BrowseTest.php b/tests/Feature/FileManager/BrowseTest.php
index d1bafedb..85f62779 100644
--- a/tests/Feature/FileManager/BrowseTest.php
+++ b/tests/Feature/FileManager/BrowseTest.php
@@ -338,8 +338,8 @@ class BrowseTest extends TestCase
                 'parent_id'  => null,
                 'name'       => 'root',
                 'user_id'    => $user->id,
-                'deleted_at' => Carbon::now(),
                 "user_scope" => "master",
+                'deleted_at' => Carbon::now(),
             ]);
 
         $file = File::factory(File::class)