diff --git a/src/Core/FileTime.Core.Services/Tab.cs b/src/Core/FileTime.Core.Services/Tab.cs
index ab02aed..199fb44 100644
--- a/src/Core/FileTime.Core.Services/Tab.cs
+++ b/src/Core/FileTime.Core.Services/Tab.cs
@@ -101,7 +101,7 @@ public class Tab : ITab
         //TODO: Order
         => SortExpressionComparer<IItem>
             .Ascending(i => i.Type)
-            .ThenByAscending(i => i.DisplayName?.ToLower() ?? "");
+            .ThenByAscending(i => i.DisplayName.ToLower());
 
     private async Task<IItem> MapItem(AbsolutePath item) => await item.ResolveAsync(true);
 
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
index 6724665..c047282 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
@@ -373,12 +373,15 @@
                                         </Image.RenderTransform>
                                     </Image>
                                 </Grid>
+                                <!--  Note: On Windows CurrentItemsCollection is not sorted (for some reason)  -->
+                                <!--  Although CurrentItemsCollectionObservable is slower, but it is sorted  -->
+                                <!--  This should be fixed (works on linux tho...)  -->
                                 <ListBox
                                     AutoScrollToSelectedItem="True"
                                     Classes="ContentListView"
                                     Grid.Row="1"
                                     IsTabStop="True"
-                                    ItemsSource="{Binding AppState.SelectedTab^.CurrentItemsCollection.Collection}"
+                                    ItemsSource="{Binding AppState.SelectedTab^.CurrentItemsCollectionObservable^}"
                                     ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                                     ScrollViewer.VerticalScrollBarVisibility="Visible"
                                     SelectedItem="{Binding AppState.SelectedTab^.CurrentSelectedItem^}"