diff --git a/src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 462cf3a1f7..8a45ec8244 100644
--- a/src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -16,8 +16,8 @@ namespace Perspex.Diagnostics.ViewModels
             {
                 Properties = control.GetRegisteredProperties()
                     .Select(x => new PropertyDetails(control, x))
-                    .OrderBy(x => x.Name)
-                    .OrderBy(x => x.IsAttached);
+                    .OrderBy(x => x.IsAttached)
+                    .ThenBy(x => x.Name);
             }
         }