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 aca08c36f..1bbc17c9f 100644
--- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
@@ -158,7 +158,7 @@ public final class OpenFileSystemModel {
                     TerminalHelper.open(adjustedPath, cmd);
                 }
             });
-            return Optional.of(currentPath.get());
+            return Optional.ofNullable(currentPath.get());
         }
 
         // Evaluate optional links