diff --git a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
index bdc9d8546..8ace6c03c 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
@@ -3,7 +3,6 @@ package io.xpipe.app.comp.store;
 import io.xpipe.app.fxcomps.Comp;
 import io.xpipe.app.fxcomps.augment.GrowAugment;
 import io.xpipe.app.fxcomps.util.PlatformThread;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.geometry.HPos;
@@ -41,9 +40,11 @@ public class DenseStoreEntryComp extends StoreEntryComp {
                     .bind(PlatformThread.sync(Bindings.createStringBinding(
                             () -> {
                                 var val = summary.getValue();
-                                if (val != null
-                                        && grid.isHover()
-                                        && getWrapper().getEntry().getProvider().alwaysShowSummary()) {
+                                var p = getWrapper().getEntry().getProvider();
+                                if (val != null && grid.isHover()
+                                        && p.alwaysShowSummary()) {
+                                    return val;
+                                } else if (info.getValue() == null && p.alwaysShowSummary()){
                                     return val;
                                 } else {
                                     return info.getValue();
diff --git a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
index 3e2904845..fa9b90a41 100644
--- a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
+++ b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
@@ -255,6 +255,10 @@ public class CommandBuilder {
     }
 
     public String buildFull(ShellControl sc) throws Exception {
+        if (sc == null) {
+            return buildSimple();
+        }
+
         var s = buildBase(sc);
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
         for (var e : environmentVariables.entrySet()) {