diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java
index fd533653..44a0caef 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java
@@ -65,6 +65,10 @@ public class BrowserQuickAccessContextMenu extends ContextMenu {
         getItems().clear();
         ThreadHelper.runFailableAsync(() -> {
             var entry = base.get();
+            if (entry == null) {
+                return;
+            }
+
             if (entry.getRawFileEntry().resolved().getKind() != FileKind.DIRECTORY) {
                 return;
             }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java
index b9af1979..2fad4284 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java
@@ -37,7 +37,7 @@ public class EditFileAction implements LeafAction {
     @Override
     public ObservableValue<String> getName(OpenFileSystemModel model, List<BrowserEntry> entries) {
         var e = AppPrefs.get().externalEditor().getValue();
-        return AppI18n.observable("editWithEditor", e.toTranslatedString().getValue());
+        return AppI18n.observable("editWithEditor", e != null ? e.toTranslatedString().getValue() : "?");
     }
 
     @Override