diff --git a/playground/Stress/Stress.AppHost/Program.cs b/playground/Stress/Stress.AppHost/Program.cs
index a58f8dcc19c..d9a54d928b8 100644
--- a/playground/Stress/Stress.AppHost/Program.cs
+++ b/playground/Stress/Stress.AppHost/Program.cs
@@ -126,6 +126,10 @@
 builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
 #endif
 
+builder.AddExecutable("executableWithSingleArg", "dotnet", Environment.CurrentDirectory, "--version");
+builder.AddExecutable("executableWithSingleEscapedArg", "dotnet", Environment.CurrentDirectory, "one two");
+builder.AddExecutable("executableWithMultipleArgs", "dotnet", Environment.CurrentDirectory, "--version", "one two");
+
 IResourceBuilder<IResource>? previousResourceBuilder = null;
 
 for (var i = 0; i < 3; i++)
diff --git a/src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor b/src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
index 647c7b61aa3..98f654c88c1 100644
--- a/src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
+++ b/src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
@@ -1,5 +1,4 @@
-@using Aspire.Dashboard.Model
-@using Aspire.Dashboard.Resources
+@using Aspire.Dashboard.Resources
 @using Aspire.Dashboard.Utils
 
 @inject IStringLocalizer<Columns> Loc
@@ -21,7 +20,12 @@
             {
                 if (launchArgument.IsShown)
                 {
-                    <span class="subtext">&nbsp;@launchArgument.Value</span>
+                    <span class="subtext">@FormatValue(launchArgument.Value)</span>
+
+                    static string FormatValue(string value)
+                    {
+                        return " " + (value.Contains(' ') ? $"\"{value}\"" : value);
+                    }
                 }
                 else
                 {