diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart
index 44def46c2..602dd5171 100644
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@@ -1312,6 +1312,7 @@ class _FileManagerViewState extends State<FileManagerView> {
                               },
                               dismissOnClicked: true));
                         }
+                        menuItems.add(MenuEntryDivider());
                       } catch (e) {
                         debugPrint("buildBread fetchDirectory err=$e");
                       } finally {
@@ -1320,7 +1321,6 @@ class _FileManagerViewState extends State<FileManagerView> {
                         }
                       }
                     }
-                    menuItems.add(MenuEntryDivider());
                     mod_menu.showMenu(
                         context: context,
                         position: RelativeRect.fromLTRB(x, y, x, y),
diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index 1c4be4a9c..6efcc6f30 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -283,7 +283,9 @@ class FileController {
   }
 
   Future<void> onReady() async {
-    options.value.home = await bind.mainGetHomeDir();
+    if (isLocal) {
+      options.value.home = await bind.mainGetHomeDir();
+    }
     options.value.showHidden = (await bind.sessionGetPeerOption(
             id: sessionID,
             name: isLocal ? "local_show_hidden" : "remote_show_hidden"))