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 081e349a..ed601c4a 100644
--- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
@@ -45,7 +45,6 @@ public final class OpenFileSystemModel {
     private FileSystem fileSystem;
     private OpenFileSystemSavedState savedState;
     private OpenFileSystemCache cache;
-    private int customScriptsStartIndex;
 
     public OpenFileSystemModel(BrowserModel browserModel, DataStoreEntryRef<? extends FileSystemStore> entry) {
         this.browserModel = browserModel;
@@ -391,10 +390,7 @@ public final class OpenFileSystemModel {
         BooleanScope.execute(busy, () -> {
             var fs = entry.getStore().createFileSystem();
             if (fs.getShell().isPresent()) {
-                this.customScriptsStartIndex =
-                        fs.getShell().get().getInitCommands().size();
                 ProcessControlProvider.get().withDefaultScripts(fs.getShell().get());
-
                 fs.getShell().get().onKill(() -> {
                     browserModel.closeFileSystemAsync(this);
                 });
diff --git a/app/src/main/java/io/xpipe/app/exchange/LaunchExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/LaunchExchangeImpl.java
index 74082a05..a61c3311 100644
--- a/app/src/main/java/io/xpipe/app/exchange/LaunchExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/exchange/LaunchExchangeImpl.java
@@ -17,7 +17,7 @@ public class LaunchExchangeImpl extends LaunchExchange
         var store = getStoreEntryById(msg.getId(), false);
         if (store.getStore() instanceof LaunchableStore s) {
             var command = s.prepareLaunchCommand()
-                    .prepareTerminalOpen(TerminalInitScriptConfig.ofName(store.getName()), null);
+                    .prepareTerminalOpen(TerminalInitScriptConfig.ofName(store.getName()), sc -> null);
             return Response.builder().command(split(command)).build();
         }
 
diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java
index fae426f7..6cc6fd57 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellControl.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java
@@ -22,6 +22,8 @@ public interface ShellControl extends ProcessControl {
 
     List<UUID> getExitUuids();
 
+    void setWorkingDirectory(FailableFunction<ShellControl, String, Exception> workingDirectory);
+
     Optional<ShellStore> getSourceStore();
 
     ShellControl withSourceStore(ShellStore store);