diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
index 5e7eb2d70..f5ae6436b 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
@@ -147,11 +147,9 @@ public class StoreChoicePopover<T extends DataStore> {
                     ignored -> true);
             var filter = FilterComp.ofStoreFilter(storeFilter).hgrow();
 
-            var addButton = creationCategory != null
+            var addButton = creationCategory != null && creationCategory.getDefaultProvider() != null
                     ? new ButtonComp(null, new LabelGraphic.IconGraphic("mdi2p-plus"), () -> {
-                                StoreCreationDialog.showCreation(
-                                        creationCategory.getDefaultProvider() != null ?
-                                                DataStoreProviders.byId(creationCategory.getDefaultProvider()).orElseThrow() : null,
+                                StoreCreationDialog.showCreation(DataStoreProviders.byId(creationCategory.getDefaultProvider()).orElseThrow(),
                                         creationCategory);
                             })
                             .describe(d -> d.nameKey("addConnection"))
diff --git a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
index 761fbe2fa..550355009 100644
--- a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
@@ -145,11 +145,7 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
 
             command.add("--always-new-process")
                     .add(configuration.getPanes().getFirst().getDialectLaunchCommand());
-            ThreadHelper.runFailableAsync(() -> {
-                try (var sc = ProcessControlProvider.get().createLocalProcessControl(true).start()) {
-                    sc.command(command).execute();
-                }
-            });
+            ExternalApplicationHelper.startAsync(command);
             activeSocket = waitForInstanceStart(50);
             if (activeSocket.isEmpty()) {
                 return;