diff --git a/src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs b/src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
index 6031f60188..fa93410713 100644
--- a/src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
+++ b/src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
@@ -86,7 +86,7 @@ public partial class PropertyGrid<TItem> where TItem : IPropertyGridItem
     private static readonly RenderFragment<TItem> s_emptyChildContent = _ => builder => { };
 
     private static readonly GridSort<TItem> s_defaultNameSort = GridSort<TItem>.ByAscending(vm => vm.Name);
-    private static readonly GridSort<TItem> s_defaultValueSort = GridSort<TItem>.ByAscending(vm => vm.Value);
+    private static readonly GridSort<TItem> s_defaultValueSort = GridSort<TItem>.ByAscending(vm => vm.IsValueMasked ? null : vm.Value);
 
     [Parameter, EditorRequired]
     public IQueryable<TItem>? Items { get; set; }
diff --git a/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor b/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
index c0709cfa19..57e4401fc7 100644
--- a/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
+++ b/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
@@ -53,7 +53,6 @@
                 <PropertyGrid
                     TItem="ResourcePropertyViewModel"
                     Items="@FilteredResourceProperties"
-                    IsValueSortable="false"
                     IsValueMaskedChanged="@OnValueMaskedChanged"
                     HighlightText="@_filter"
                     GridTemplateColumns="1fr 1.5fr" />