diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java b/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java
index cf78e25d7..f63b967ce 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java
@@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.SneakyThrows;
 import lombok.Value;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Value
@@ -54,7 +55,7 @@ public class BrowserSavedStateImpl implements BrowserSavedState {
     }
 
     @Override
-    public void save() {
+    public synchronized void save() {
         AppCache.update("browser-state", this);
     }
 
diff --git a/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java
index 5a76bc1ff..8359799e3 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java
@@ -85,7 +85,6 @@ public class FileSystemHelper {
         var resolved = shell.get()
                 .getShellDialect()
                 .resolveDirectory(shell.get(), path)
-                .withWorkingDirectory(model.getCurrentPath().get())
                 .readStdoutOrThrow();
 
         if (!FileNames.isAbsolute(resolved)) {
diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
index 4bbd62df4..6898d6c9d 100644
--- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
@@ -539,11 +539,11 @@ public final class OpenFileSystemModel extends BrowserSessionTab<FileSystemStore
     }
 
     public void backSync(int i) throws Exception {
-        cdSyncWithoutCheck(history.back(i));
+        cdSync(history.back(i));
     }
 
     public void forthSync(int i) throws Exception {
-        cdSyncWithoutCheck(history.forth(i));
+        cdSync(history.forth(i));
     }
 
     @Getter
diff --git a/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java b/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
index b27636df8..26fb7542e 100644
--- a/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
+++ b/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
@@ -148,7 +148,9 @@ public class ConnectionFileSystem implements FileSystem {
 
     @Override
     public void directoryAccessible(String file) throws Exception {
-        shellControl.executeSimpleCommand(shellControl.getShellDialect().getCdCommand(file));
+        var current = shellControl.executeSimpleStringCommand(shellControl.getShellDialect().getPrintWorkingDirectoryCommand());
+        shellControl.command(shellControl.getShellDialect().getCdCommand(file));
+        shellControl.command(shellControl.getShellDialect().getCdCommand(current));
     }
 
     @Override