diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java
index 6043602c2..96b726808 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java
@@ -47,6 +47,10 @@ public class BrowserFileSystemHelper {
             return null;
         }
 
+        if (model.getFileSystem() == null) {
+            return path;
+        }
+
         var shell = model.getFileSystem().getShell();
         if (shell.isEmpty() || !shell.get().isRunning(true)) {
             return path;
diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java
index 82840c90f..93b69839e 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java
@@ -43,8 +43,13 @@ public class BrowserOverviewComp extends SimpleComp {
             var common = sc.getOsType().determineInterestingPaths(sc).stream()
                     .map(s -> FileEntry.ofDirectory(model.getFileSystem(), s))
                     .filter(entry -> {
+                        var fs = model.getFileSystem();
+                        if (fs == null) {
+                            return false;
+                        }
+
                         try {
-                            return model.getFileSystem().directoryExists(entry.getPath());
+                            return fs.directoryExists(entry.getPath());
                         } catch (Exception e) {
                             ErrorEvent.fromThrowable(e).handle();
                             return false;