diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
index 58dec25dd..6be8c6560 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
@@ -9,6 +9,7 @@ import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.util.CustomComboBoxBuilder;
 import io.xpipe.app.util.XPipeDaemon;
 import io.xpipe.core.store.DataStore;
+import io.xpipe.core.store.LeafShellStore;
 import io.xpipe.core.store.ShellStore;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleStringProperty;
@@ -104,7 +105,7 @@ public class DataStoreChoiceComp<T extends DataStore> extends SimpleComp {
                 continue;
             }
 
-            if (!(mode == Mode.ENVIRONMENT) && !((ShellStore) s).canHaveSubs()) {
+            if (!(mode == Mode.ENVIRONMENT) && s instanceof LeafShellStore) {
                 continue;
             }
 
diff --git a/core/src/main/java/io/xpipe/core/store/LeafShellStore.java b/core/src/main/java/io/xpipe/core/store/LeafShellStore.java
new file mode 100644
index 000000000..f0c22bc62
--- /dev/null
+++ b/core/src/main/java/io/xpipe/core/store/LeafShellStore.java
@@ -0,0 +1,5 @@
+package io.xpipe.core.store;
+
+public interface LeafShellStore extends DataStore {
+
+}
diff --git a/core/src/main/java/io/xpipe/core/store/LeafStore.java b/core/src/main/java/io/xpipe/core/store/LeafStore.java
deleted file mode 100644
index 0e4819ccd..000000000
--- a/core/src/main/java/io/xpipe/core/store/LeafStore.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.xpipe.core.store;
-
-public interface LeafStore extends DataStore {
-
-}
diff --git a/core/src/main/java/io/xpipe/core/store/ShellStore.java b/core/src/main/java/io/xpipe/core/store/ShellStore.java
index c7b41942c..f7cf02267 100644
--- a/core/src/main/java/io/xpipe/core/store/ShellStore.java
+++ b/core/src/main/java/io/xpipe/core/store/ShellStore.java
@@ -17,10 +17,6 @@ public interface ShellStore extends DataStore, StatefulDataStore, LaunchableStor
         return s instanceof LocalStore;
     }
 
-    default boolean canHaveSubs() {
-        return true;
-    }
-
     @Override
     default FileSystem createFileSystem() {
         return new ConnectionFileSystem(create(), this);