diff --git a/UICatalog/Scenarios/TreeViewFileSystem.cs b/UICatalog/Scenarios/TreeViewFileSystem.cs
index bc02b3bb6..59805f22a 100644
--- a/UICatalog/Scenarios/TreeViewFileSystem.cs
+++ b/UICatalog/Scenarios/TreeViewFileSystem.cs
@@ -88,7 +88,10 @@ namespace UICatalog.Scenarios {
 			// If it is a directory it's children are all contained files and dirs
 			if(model is DirectoryInfo d) {
 				try {
-					return d.GetFileSystemInfos();
+					return d.GetFileSystemInfos()
+						//show directories first
+						.OrderBy(a=>a is DirectoryInfo ? 0:1)
+						.ThenBy(b=>b.Name);
 				}
 				catch(SystemException ex) {
 					return new []{ex};