diff --git a/src/controllers/FolderController.php b/src/controllers/FolderController.php
index fb974a95..5f5fe9a2 100644
--- a/src/controllers/FolderController.php
+++ b/src/controllers/FolderController.php
@@ -22,7 +22,7 @@ public function getFolders()
             $folder_types['user'] = 'root';
         }
 
-        if (parent::allowMultiUser() && parent::enabledShareFolder()) {
+        if ((parent::allowMultiUser() && parent::enabledShareFolder()) || !parent::allowMultiUser()) {
             $folder_types['share'] = 'shares';
         }
 
diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php
index 0e5dd80f..7d1d01d9 100644
--- a/src/traits/LfmHelpers.php
+++ b/src/traits/LfmHelpers.php
@@ -72,7 +72,7 @@ private function getFormatedWorkingDir()
     {
         $working_dir = request('working_dir');
 
-        if (is_null($working_dir)) {
+        if (empty($working_dir)) {
             $default_folder_type = 'share';
             if ($this->allowMultiUser()) {
                 $default_folder_type = 'user';