diff --git a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
index b5310c9d4..5f562d827 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
@@ -139,6 +139,7 @@ public class BaseMode extends OperationMode {
                 },
                 () -> {
                     BrowserIconManager.loadIfNecessary();
+                    shellLoaded.await();
                     BrowserLocalFileSystem.init();
                     storageLoaded.await();
                     BrowserFullSessionModel.init();