diff --git a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
index 300674039..4b7dff6e4 100644
--- a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
+++ b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
@@ -104,6 +104,10 @@ public class FileSystemHelper {
             return;
         }
 
+        if (model.getFileSystem() == null) {
+            return;
+        }
+
         var shell = model.getFileSystem().getShell();
         if (shell.isEmpty()) {
             return;
diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
index e76a0bd29..376444ee1 100644
--- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
@@ -162,7 +162,7 @@ public final class OpenFileSystemModel {
                             fileSystem
                                     .getShell()
                                     .get()
-                                    .subShell(processControl -> adjustedPath, (sc) -> adjustedPath)
+                                    .subShell(adjustedPath)
                                     .withInitSnippet(new SimpleScriptSnippet(
                                             fileSystem
                                                     .getShell()