From bae4ebde7ef7472bc6fde9567080ba253aa0f629 Mon Sep 17 00:00:00 2001
From: jklawreszuk <jk.lawreszuk@gmail.com>
Date: Sat, 3 May 2025 14:55:22 +0200
Subject: [PATCH 1/2] feat: Implement Project selection/creation

---
 .../ITemplateDescriptionViewModel.cs          |  30 +++++
 ...rOpenSessionTemplateCollectionViewModel.cs |  30 +++++
 .../ObjectBrowserUserControl.axaml            |  30 +++++
 .../ObjectBrowserUserControl.axaml.cs         | 123 ++++++++++++++++++
 .../ProjectSelectionWindow.axaml              |  54 ++++++++
 .../ProjectSelectionWindow.axaml.cs           |  15 +++
 .../TemplateBrowserUserControl.axaml          |  37 ++++++
 .../TemplateBrowserUserControl.axaml.cs       |  17 +++
 .../TemplateDescriptionCollectionViewModel.cs |  67 ++++++++++
 .../TemplateDescriptionGroupViewModel.cs      |  71 ++++++++++
 .../Services/EditorDialogHelper.cs            |  44 +++++++
 .../Stride.Core.Assets.Editor.csproj          |   1 +
 .../ViewModels/AssetCollectionViewModel.cs    |  31 +++++
 .../ViewModels/EditorViewModel.cs             |  10 ++
 .../MostRecentlyUsedFileCollection.cs         |   5 +-
 .../Stride.GameStudio.Avalonia/App.axaml.cs   |  12 +-
 .../Services/DialogResult.cs                  |  24 ----
 .../Services/IModalDialog.cs                  |  31 -----
 .../Services/DialogResult.cs                  |  23 ++++
 .../Services/IModalDialog.cs                  |  28 ++++
 20 files changed, 619 insertions(+), 64 deletions(-)
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/ITemplateDescriptionViewModel.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionCollectionViewModel.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionGroupViewModel.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor/Services/EditorDialogHelper.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor/ViewModels/EditorViewModel.cs
 delete mode 100644 sources/presentation/Stride.Core.Presentation.Wpf/Services/DialogResult.cs
 delete mode 100644 sources/presentation/Stride.Core.Presentation.Wpf/Services/IModalDialog.cs
 create mode 100644 sources/presentation/Stride.Core.Presentation/Services/DialogResult.cs
 create mode 100644 sources/presentation/Stride.Core.Presentation/Services/IModalDialog.cs

diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/ITemplateDescriptionViewModel.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ITemplateDescriptionViewModel.cs
new file mode 100644
index 0000000000..887a5a2a71
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ITemplateDescriptionViewModel.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.Imaging;
+using Stride.Core.Assets.Templates;
+
+namespace Stride.Core.Assets.Editor.Components.TemplateDescriptions.ViewModels
+{
+    public interface ITemplateDescriptionViewModel
+    {
+        string Name { get; }
+
+        string Description { get; }
+
+        string FullDescription { get; }
+
+        string Group { get; }
+
+        Guid Id { get; }
+
+        string DefaultOutputName { get; }
+
+        Bitmap Icon { get; }
+
+        IEnumerable<Bitmap> Screenshots { get; }
+
+        TemplateDescription GetTemplate();
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
new file mode 100644
index 0000000000..39a7363f94
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
@@ -0,0 +1,30 @@
+using Stride.Core.Assets.Editor.Services;
+using Stride.Core.Presentation.Commands;
+using Stride.Core.Presentation.Services;
+using Stride.Core.Presentation.ViewModels;
+
+namespace Stride.Core.Assets.Editor.Avalonia;
+
+public class NewOrOpenSessionTemplateCollectionViewModel
+{
+    private readonly IModalDialog dialog;
+    private readonly IViewModelServiceProvider serviceProvider;
+    public NewOrOpenSessionTemplateCollectionViewModel(IViewModelServiceProvider serviceProvider)
+    {   
+        this.serviceProvider = serviceProvider;
+        BrowseForExistingProjectCommand = new AnonymousTaskCommand(serviceProvider, BrowseForExistingProject);
+    }
+    public ICommandBase BrowseForExistingProjectCommand { get; }
+    public bool AutoReloadSession { get; }
+
+    private async Task BrowseForExistingProject()
+    {
+        var filePath = await EditorDialogHelper.BrowseForExistingProject(serviceProvider);
+        if (filePath != null)
+        {
+            SelectedTemplate = new ExistingProjectViewModel(ServiceProvider, filePath, RemoveExistingProjects);
+            dialog?.RequestClose(DialogResult.Ok);
+        }
+    }
+
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml
new file mode 100644
index 0000000000..cac55ab99a
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml
@@ -0,0 +1,30 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="300"
+             x:Class="Stride.Core.Assets.Editor.Avalonia.ObjectBrowserUserControl">
+    <Grid ColumnDefinitions="*,5,3*,5,220">
+        <TreeView Grid.Column="0" SelectionMode="Single"
+                    ItemsSource="{Binding HierarchyItemsSource, ElementName=ObjectBrowser, Mode=TwoWay}"
+                    SelectedItem="{Binding SelectedHierarchyItem, ElementName=ObjectBrowser, Mode=TwoWay}"
+                    ItemTemplate="{Binding HierarchyItemTemplate, ElementName=ObjectBrowser, Mode=TwoWay}" />
+
+        <GridSplitter Grid.Column="1" ResizeBehavior="PreviousAndNext" VerticalAlignment="Stretch" Width="5"/>
+
+        <ListBox Grid.Column="2"
+                ItemsSource="{Binding ObjectItemsSource, ElementName=ObjectBrowser, Mode=TwoWay}"
+                SelectedItem="{Binding SelectedObjectItem, ElementName=ObjectBrowser, Mode=TwoWay}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
+
+        <GridSplitter Grid.Column="3" ResizeBehavior="PreviousAndNext" VerticalAlignment="Stretch" Width="5"/>
+
+        <DockPanel Grid.Column="4" Background="{DynamicResource ControlBackgroundBrush}">
+        <ScrollViewer x:Name="DescriptionScrollViewer" VerticalScrollBarVisibility="Auto">
+            <ContentPresenter Content="{Binding SelectedObjectItem, ElementName=ObjectBrowser, Mode=TwoWay}"
+                            ContentTemplate="{Binding ObjectDescriptionTemplate, ElementName=ObjectBrowser, Mode=TwoWay}"/>
+        </ScrollViewer>
+        </DockPanel>
+    </Grid>
+</UserControl>
+
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml.cs
new file mode 100644
index 0000000000..ded4cea6e8
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ObjectBrowserUserControl.axaml.cs
@@ -0,0 +1,123 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Collections;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+
+namespace Stride.Core.Assets.Editor.Avalonia;
+
+public partial class ObjectBrowserUserControl : UserControl
+{
+    public static readonly StyledProperty<IEnumerable> HierarchyItemsSourceProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IEnumerable>(nameof(HierarchyItemsSource));
+
+    public static readonly StyledProperty<object> SelectedHierarchyItemProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, object>(nameof(SelectedHierarchyItem));
+
+    public static readonly StyledProperty<IDataTemplate> HierarchyItemTemplateProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IDataTemplate>(nameof(HierarchyItemTemplate));
+
+    public static readonly StyledProperty<IStyle> HierarchyItemContainerStyleProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IStyle>(nameof(HierarchyItemContainerStyle));
+
+    public static readonly StyledProperty<IEnumerable> ObjectItemsSourceProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IEnumerable>(nameof(ObjectItemsSource));
+
+    public static readonly StyledProperty<object> SelectedObjectItemProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, object>(nameof(SelectedObjectItem));
+
+    public static readonly StyledProperty<IDataTemplate> ObjectItemTemplateProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IDataTemplate>(nameof(ObjectItemTemplate));
+
+    public static readonly StyledProperty<IDataTemplate> ObjectItemTemplateSelectorProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IDataTemplate>(nameof(ObjectItemTemplateSelector));
+
+    public static readonly StyledProperty<IStyle> ObjectItemContainerStyleProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IStyle>(nameof(ObjectItemContainerStyle));
+
+    public static readonly StyledProperty<IDataTemplate> ObjectDescriptionTemplateProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IDataTemplate>(nameof(ObjectDescriptionTemplate));
+
+    public static readonly StyledProperty<IDataTemplate> ObjectDescriptionTemplateSelectorProperty =
+        AvaloniaProperty.Register<ObjectBrowserUserControl, IDataTemplate>(nameof(ObjectDescriptionTemplateSelector));
+
+    public ObjectBrowserUserControl()
+    {
+        InitializeComponent();
+    }
+
+    public IEnumerable HierarchyItemsSource
+    {
+        get => GetValue(HierarchyItemsSourceProperty);
+        set => SetValue(HierarchyItemsSourceProperty, value);
+    }
+
+    public object SelectedHierarchyItem
+    {
+        get => GetValue(SelectedHierarchyItemProperty);
+        set => SetValue(SelectedHierarchyItemProperty, value);
+    }
+
+    public IDataTemplate HierarchyItemTemplate
+    {
+        get => GetValue(HierarchyItemTemplateProperty);
+        set => SetValue(HierarchyItemTemplateProperty, value);
+    }
+
+    public IStyle HierarchyItemContainerStyle
+    {
+        get => GetValue(HierarchyItemContainerStyleProperty);
+        set => SetValue(HierarchyItemContainerStyleProperty, value);
+    }
+
+    public IEnumerable ObjectItemsSource
+    {
+        get => GetValue(ObjectItemsSourceProperty);
+        set => SetValue(ObjectItemsSourceProperty, value);
+    }
+
+    public object SelectedObjectItem
+    {
+        get => GetValue(SelectedObjectItemProperty);
+        set => SetValue(SelectedObjectItemProperty, value);
+    }
+
+    public IDataTemplate ObjectItemTemplate
+    {
+        get => GetValue(ObjectItemTemplateProperty);
+        set => SetValue(ObjectItemTemplateProperty, value);
+    }
+
+    public IDataTemplate ObjectItemTemplateSelector
+    {
+        get => GetValue(ObjectItemTemplateSelectorProperty);
+        set => SetValue(ObjectItemTemplateSelectorProperty, value);
+    }
+
+    public IStyle ObjectItemContainerStyle
+    {
+        get => GetValue(ObjectItemContainerStyleProperty);
+        set => SetValue(ObjectItemContainerStyleProperty, value);
+    }
+
+    public IDataTemplate ObjectDescriptionTemplate
+    {
+        get => GetValue(ObjectDescriptionTemplateProperty);
+        set => SetValue(ObjectDescriptionTemplateProperty, value);
+    }
+
+    public IDataTemplate ObjectDescriptionTemplateSelector
+    {
+        get => GetValue(ObjectDescriptionTemplateSelectorProperty);
+        set => SetValue(ObjectDescriptionTemplateSelectorProperty, value);
+    }
+
+    // If you have a scroll viewer in your .axaml file:
+    private void OnSelectedObjectItemChanged()
+    {
+        // ScrollViewer?.ScrollToTop(); // Placeholder: hook up actual ScrollViewer reference
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml
new file mode 100644
index 0000000000..7eeb354ed4
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml
@@ -0,0 +1,54 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:avalonia="clr-namespace:Stride.Core.Assets.Editor.Avalonia"
+        xmlns:sd="http://schemas.stride3d.net/xaml/presentation"
+        mc:Ignorable="d"
+        Height="768" Width="1024" ShowInTaskbar="False"
+        x:Class="Stride.Core.Assets.Editor.Avalonia.ProjectSelectionWindow"
+        d:DataContext="{d:DesignInstance avalonia:NewOrOpenSessionTemplateCollectionViewModel}">
+        <DockPanel>
+            <Grid DockPanel.Dock="Bottom">
+                <DockPanel>
+                    <DockPanel DockPanel.Dock="Bottom" Margin="20">
+                        <Button DockPanel.Dock="Left" Content="{sd:LocalizeString Browse for existing project, Context=Button}" Command="{Binding BrowseForExistingProjectCommand}" Padding="20,6"/>
+                        <CheckBox IsChecked="{Binding AutoReloadSession}" Content="{sd:LocalizeString Reload last session automatically at startup, Context=Button}"
+                                    VerticalAlignment="Center" Margin="8"/>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <UniformGrid Rows="1">
+                                <Button Content="{sd:LocalizeString Select, Context=Button}" Padding="20,6" Margin="10,0,0,0"
+                                        IsEnabled="{Binding SelectedTemplate, Converter={sd:ObjectToBool}}">
+                                </Button>
+                                <Button Content="{sd:LocalizeString Cancel, Context=Button}" Padding="20,6" Margin="10,0,0,0" IsCancel="True">
+                                </Button>
+                            </UniformGrid>
+                        </StackPanel>
+                    </DockPanel>
+                    <Grid ColumnDefinitions="Auto,2*,*" RowDefinitions="Auto,Auto,Auto,Auto">
+                        <TextBlock Grid.Row="0" Grid.Column="0" Text="{sd:LocalizeString Name:}" Margin="20,0" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="0" Grid.Column="1" Margin="2" Text="{Binding Name}"/>
+                        <TextBlock Grid.Row="1" Grid.Column="0" Text="{sd:LocalizeString Location:}" Margin="20,0" VerticalAlignment="Center"/>
+                        <DockPanel Grid.Row="1" Grid.Column="1">
+                            <Button DockPanel.Dock="Right" Command="{Binding BrowseDirectoryCommand}" CommandParameter="Location">
+                            </Button>
+                            <TextBox Margin="2" Text="{Binding Location}"/>
+                        </DockPanel>
+                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{sd:LocalizeString Solution name:}" Margin="20,0" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="2" Grid.Column="1" Margin="2" Watermark="{sd:LocalizeString (Auto-generate solution name)}"
+                                        Text="{Binding SolutionName}">
+                        </TextBox>
+                        <TextBlock Grid.Row="3" Grid.Column="0" Text="{sd:LocalizeString Solution location:}" Margin="20,0" VerticalAlignment="Center"/>
+                        <DockPanel Grid.Row="3" Grid.Column="1">
+                            <Button DockPanel.Dock="Right" Command="{Binding BrowseDirectoryCommand}" CommandParameter="SolutionLocation" />
+                            <TextBox Margin="2" Watermark="{sd:LocalizeString (Same location)}" Text="{Binding SolutionLocation}">
+                            </TextBox>
+                        </DockPanel>
+                    </Grid>
+                </DockPanel>
+            </Grid>
+            
+            <avalonia:TemplateBrowserUserControl Margin="10"/>
+        </DockPanel>
+</Window>
+
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml.cs
new file mode 100644
index 0000000000..5d6cc82517
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/ProjectSelectionWindow.axaml.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Avalonia.Controls;
+
+namespace Stride.Core.Assets.Editor.Avalonia;
+
+public partial class ProjectSelectionWindow : Window
+{
+    public ProjectSelectionWindow()
+    {
+        InitializeComponent();
+    }
+}
+
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml
new file mode 100644
index 0000000000..7d38fb89cb
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml
@@ -0,0 +1,37 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:avalonia="clr-namespace:Stride.Core.Assets.Editor.Avalonia"
+             mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="300"
+             xmlns:viewModels="clr-namespace:Stride.Core.Assets.Editor.Components.TemplateDescriptions.ViewModels"
+             d:DataContext="{d:DesignInstance viewModels:TemplateDescriptionCollectionViewModel}"
+             x:Class="Stride.Core.Assets.Editor.Avalonia.TemplateBrowserUserControl">
+    <avalonia:ObjectBrowserUserControl HierarchyItemsSource="{Binding RootGroups}"
+                                    SelectedHierarchyItem="{Binding SelectedGroup, Mode=TwoWay}"
+                                    ObjectItemsSource="{Binding Templates}"
+                                    SelectedObjectItem="{Binding SelectedTemplate}"
+                                    ObjectItemTemplateSelector="{StaticResource DataTypeTemplateSelector}">
+        <avalonia:ObjectBrowserUserControl.HierarchyItemTemplate>
+            <TreeDataTemplate ItemsSource="{Binding SubGroups}" DataType="viewModels:TemplateDescriptionGroupViewModel">
+                <TextBlock Text="{Binding Name}"/>
+            </TreeDataTemplate>
+        </avalonia:ObjectBrowserUserControl.HierarchyItemTemplate>
+        <avalonia:ObjectBrowserUserControl.ObjectDescriptionTemplate>
+            <DataTemplate DataType="viewModels:ITemplateDescriptionViewModel">
+                <StackPanel DockPanel.Dock="Top">
+                    <TextBlock FontWeight="Bold" Text="{Binding Name}" Margin="10"/>
+                    <TextBlock Text="{Binding FullDescription}" Margin="10,20" TextWrapping="Wrap"/>
+
+                    <ItemsControl ItemsSource="{Binding Screenshots}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Image Margin="2,12" Source="{Binding}" MaxWidth="192" StretchDirection="DownOnly" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+            </DataTemplate>
+        </avalonia:ObjectBrowserUserControl.ObjectDescriptionTemplate>
+    </avalonia:ObjectBrowserUserControl>
+</UserControl>
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml.cs
new file mode 100644
index 0000000000..2c1cfd1e59
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateBrowserUserControl.axaml.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Stride.Core.Assets.Editor.Avalonia;
+
+public partial class TemplateBrowserUserControl : UserControl
+{
+    public TemplateBrowserUserControl()
+    {
+        InitializeComponent();
+    }
+}
+
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionCollectionViewModel.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionCollectionViewModel.cs
new file mode 100644
index 0000000000..042fc54f6a
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionCollectionViewModel.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using System.Linq;
+using Stride.Core.Presentation.Collections;
+using Stride.Core.Presentation.ViewModels;
+
+namespace Stride.Core.Assets.Editor.Components.TemplateDescriptions.ViewModels
+{
+    public abstract class TemplateDescriptionCollectionViewModel : DispatcherViewModel
+    {
+        private readonly ObservableList<ITemplateDescriptionViewModel> templates = new ObservableList<ITemplateDescriptionViewModel>();
+
+        private TemplateDescriptionGroupViewModel selectedGroup;
+        private ITemplateDescriptionViewModel selectedTemplate;
+        private string name;
+        private bool usedDefinedName;
+
+        protected TemplateDescriptionCollectionViewModel(IViewModelServiceProvider serviceProvider)
+            : base(serviceProvider)
+        {
+        }
+
+
+        public IReadOnlyObservableCollection<ITemplateDescriptionViewModel> Templates => templates;
+
+        public abstract IEnumerable<TemplateDescriptionGroupViewModel> RootGroups { get; }
+
+        public TemplateDescriptionGroupViewModel SelectedGroup { get { return selectedGroup; } set { SetValue(ref selectedGroup, value, UpdateTemplateList); } }
+
+        public ITemplateDescriptionViewModel SelectedTemplate { get { return selectedTemplate; } set { SetValue(ref selectedTemplate, value); UpdateName(); } }
+
+        public string Name { get { return name; } set { usedDefinedName = !string.IsNullOrEmpty(value) && name != value; SetValue(ref name, value); } }
+
+        public abstract bool ValidateProperties(out string error);
+
+        protected static TemplateDescriptionGroupViewModel ProcessGroup(TemplateDescriptionGroupViewModel rootGroup, string groupPath)
+        {
+            if (string.IsNullOrWhiteSpace(groupPath))
+                return null;
+
+            var groupDirectories = groupPath.Split("/\\".ToCharArray());
+            return groupDirectories.Aggregate(rootGroup, (current, groupDirectory) => current.SubGroups.FirstOrDefault(x => x.Name == groupDirectory) ?? new TemplateDescriptionGroupViewModel(current, groupDirectory));
+        }
+
+        protected abstract string UpdateNameFromSelectedTemplate();
+
+        protected void UpdateTemplateList()
+        {
+            templates.Clear();
+            if (SelectedGroup != null)
+            {
+                templates.AddRange(SelectedGroup.GetTemplatesRecursively());
+            }
+        }
+
+        private void UpdateName()
+        {
+            if (usedDefinedName)
+                return;
+
+            Name = SelectedTemplate != null ? UpdateNameFromSelectedTemplate() : string.Empty;
+
+            usedDefinedName = false;
+        }
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionGroupViewModel.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionGroupViewModel.cs
new file mode 100644
index 0000000000..490337f1b6
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/TemplateDescriptionGroupViewModel.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Stride.Core.Extensions;
+using Stride.Core.Presentation.Collections;
+using Stride.Core.Presentation.ViewModels;
+
+namespace Stride.Core.Assets.Editor.Components.TemplateDescriptions.ViewModels
+{
+    public class TemplateDescriptionGroupViewModel : DispatcherViewModel, IComparable<TemplateDescriptionGroupViewModel>
+    {
+        public const string Separator = "/";
+
+        private readonly SortedObservableCollection<TemplateDescriptionGroupViewModel> subGroups = [];
+
+        public TemplateDescriptionGroupViewModel(TemplateDescriptionGroupViewModel parent, string name)
+            : this(parent.SafeArgument(nameof(parent)).ServiceProvider, name)
+        {
+            if (parent == null) throw new ArgumentNullException(nameof(parent));
+            Parent = parent;
+            Parent.subGroups.Add(this);
+        }
+
+        public TemplateDescriptionGroupViewModel(IViewModelServiceProvider serviceProvider, string name)
+            : base(serviceProvider)
+        {
+            if (name == null) throw new ArgumentNullException(nameof(name));
+            Name = name;
+            Templates = new ObservableList<ITemplateDescriptionViewModel>();
+            DependentProperties.Add(nameof(Parent), new[] { nameof(Path) });
+        }
+
+        public string Name { get; }
+
+        public string Path => IsRoot ? "" : Parent.Path + Name + (Name.Length > 0 ? Separator : "");
+
+        public TemplateDescriptionGroupViewModel Parent { get; }
+
+        public bool IsRoot => Parent == null;
+
+        public IReadOnlyObservableCollection<TemplateDescriptionGroupViewModel> SubGroups => subGroups;
+
+        public ObservableList<ITemplateDescriptionViewModel> Templates { get; }
+
+        public IEnumerable<ITemplateDescriptionViewModel> GetTemplatesRecursively()
+        {
+            var allGroup = SubGroups.SelectDeep(x => x.SubGroups);
+            return Templates.Concat(allGroup.SelectMany(x => x.Templates));
+        }
+
+        public void Clear()
+        {
+            subGroups.Clear();
+            Templates.Clear();
+        }
+
+        /// <inheritdoc/>
+        public int CompareTo(TemplateDescriptionGroupViewModel other)
+        {
+            return other != null ? string.Compare(Name, other.Name, StringComparison.InvariantCultureIgnoreCase) : -1;
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            return "TemplateDescriptionGroupViewModel [" + Path + "]";
+        }
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor/Services/EditorDialogHelper.cs b/sources/editor/Stride.Core.Assets.Editor/Services/EditorDialogHelper.cs
new file mode 100644
index 0000000000..dff1695222
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor/Services/EditorDialogHelper.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Stride.Core.Assets.Editor.Settings;
+using Stride.Core.Assets.Editor.ViewModels;
+using Stride.Core.Extensions;
+using Stride.Core.IO;
+using Stride.Core.Presentation.Services;
+using Stride.Core.Presentation.ViewModels;
+
+namespace Stride.Core.Assets.Editor.Services
+{
+    public static class EditorDialogHelper
+    {
+        // TODO: Put ShowMessage here, find a way to reach the editor title from Stride
+
+        public static async Task<UFile> BrowseForExistingProject(IViewModelServiceProvider serviceProvider)
+        {
+            var initialDirectory = InternalSettings.FileDialogLastOpenSessionDirectory.GetValue();
+            var filters = new List<FilePickerFilter>
+            {
+                new("Solution or package files") { Patterns = [EditorViewModel.SolutionFileExtension, EditorViewModel.PackageFileExtension]},
+                new("Solution file") { Patterns = [EditorViewModel.SolutionFileExtension]},
+                new("Package file") { Patterns = [EditorViewModel.PackageFileExtension]},
+            };
+            var filePaths = await OpenFileDialog(serviceProvider, false, initialDirectory, filters);
+            return filePaths?.FirstOrDefault();
+        }
+
+        public static async Task<IEnumerable<UFile>> OpenFileDialog(IViewModelServiceProvider serviceProvider, bool allowMultiSelection, string initialDirectory, IReadOnlyList<FilePickerFilter> filters = null)
+        {
+            if (allowMultiSelection)
+            {
+                var files = await serviceProvider.Get<IDialogService>().OpenMultipleFilesPickerAsync(initialDirectory, filters);
+                return files.Count > 0 ? files : null;
+            }
+
+            var file = await serviceProvider.Get<IDialogService>().OpenFilePickerAsync(initialDirectory, filters);
+            return file?.Yield();
+        }
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj b/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
index 79c1bc25bc..79b027f363 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
+++ b/sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
@@ -19,5 +19,6 @@
     <ProjectReference Include="..\..\editor\Stride.Core.Assets.Presentation\Stride.Core.Assets.Presentation.csproj" />
   </ItemGroup>
 
+  <Import Project="..\..\editor\Stride.Core.MostRecentlyUsedFiles\Stride.Core.MostRecentlyUsedFiles.projitems" Label="Shared" />
   <Import Project="$(StrideSdkTargets)" />
 </Project>
diff --git a/sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCollectionViewModel.cs b/sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCollectionViewModel.cs
index 138d7b080c..7f94ad2120 100644
--- a/sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCollectionViewModel.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCollectionViewModel.cs
@@ -12,6 +12,37 @@
 
 namespace Stride.Core.Assets.Editor.ViewModels;
 
+public enum DisplayAssetMode
+{
+    AssetInSelectedFolderOnly,
+    AssetInSelectedFolderAndSubFolder,
+    AssetAndFolderInSelectedFolder,
+}
+
+public enum FilterCategory
+{
+    AssetName,
+    AssetTag,
+    AssetType,
+}
+
+public enum SortRule
+{
+    Name,
+    TypeOrderThenName,
+    DirtyThenName,
+    ModificationDateThenName,
+}
+
+[DataContract(nameof(AssetFilterViewModelData))]
+public sealed class AssetFilterViewModelData
+{
+    public string DisplayName = "";
+    public string Filter = "";
+    public bool IsActive = false;
+    public FilterCategory category = FilterCategory.AssetName;
+}
+
 public sealed class AssetCollectionViewModel : DispatcherViewModel
 {
     private readonly ObservableSet<AssetViewModel> assets = [];
diff --git a/sources/editor/Stride.Core.Assets.Editor/ViewModels/EditorViewModel.cs b/sources/editor/Stride.Core.Assets.Editor/ViewModels/EditorViewModel.cs
new file mode 100644
index 0000000000..6e69b1697a
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor/ViewModels/EditorViewModel.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Stride.Core.Assets.Editor.ViewModels;
+
+public abstract class EditorViewModel
+{
+    public const string PackageFileExtension = $"*Package.PackageFileExtension";
+    public const string SolutionFileExtension = "*.sln";
+}
diff --git a/sources/editor/Stride.Core.MostRecentlyUsedFiles/MostRecentlyUsedFileCollection.cs b/sources/editor/Stride.Core.MostRecentlyUsedFiles/MostRecentlyUsedFileCollection.cs
index 4706f9689a..79e5e22a19 100644
--- a/sources/editor/Stride.Core.MostRecentlyUsedFiles/MostRecentlyUsedFileCollection.cs
+++ b/sources/editor/Stride.Core.MostRecentlyUsedFiles/MostRecentlyUsedFileCollection.cs
@@ -14,10 +14,7 @@ namespace Stride.Core.MostRecentlyUsedFiles
 {
     // TODO: this is a hack because YamlSerializer is static and there is no way to disable serialization with Id for Settings at the moment. This is temporary!
     [NonIdentifiableCollectionItems]
-    public class MRUDictionary : Dictionary<string, List<MostRecentlyUsedFile>>
-    {
-
-    }
+    public class MRUDictionary : Dictionary<string, List<MostRecentlyUsedFile>>;
 
     /// <summary>
     /// A class that handles a list of most recently used (MRU) files.
diff --git a/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs b/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
index 4445532993..038b157f01 100644
--- a/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
+++ b/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.Themes.Fluent;
+using Stride.Core.Assets.Editor.Avalonia;
 using Stride.Core.Assets.Editor.Services;
 using Stride.Core.Assets.Editor.Settings;
 using Stride.Core.IO;
@@ -102,7 +103,7 @@ public override void OnFrameworkInitializationCompleted()
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            desktop.MainWindow = new MainWindow();
+            desktop.MainWindow = new ProjectSelectionWindow();
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
@@ -125,11 +126,12 @@ public void Restart(UFile? initialPath = null)
         }
     }
 
-    private static MainViewModel InitializeMainViewModel(UFile? initialPath)
+    private static object InitializeMainViewModel(UFile? initialPath)
     {
-        var viewmodel = new MainViewModel(InitializeServiceProvider());
-        if (initialPath is not null)
-            viewmodel.OpenCommand.Execute(initialPath);
+        //Switch viewmodel depending the program arguments
+        var viewmodel = new NewOrOpenSessionTemplateCollectionViewModel(InitializeServiceProvider());
+        // if (initialPath is not null)
+        //     vm.OpenCommand.Execute(initialPath);
         return viewmodel;
     }
 
diff --git a/sources/presentation/Stride.Core.Presentation.Wpf/Services/DialogResult.cs b/sources/presentation/Stride.Core.Presentation.Wpf/Services/DialogResult.cs
deleted file mode 100644
index 28c96d98ef..0000000000
--- a/sources/presentation/Stride.Core.Presentation.Wpf/Services/DialogResult.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-namespace Stride.Core.Presentation.Services
-{
-    // TODO: make these enum independent from their System.Windows equivalent
-    /// <summary>
-    /// An enum representing the result of a dialog invocation.
-    /// </summary>
-    public enum DialogResult
-    {
-        /// <summary>
-        /// The dialog has not been invoked or closed yet.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// The dialog has been closed by a validation from the user.
-        /// </summary>
-        Ok = 1,
-        /// <summary>
-        /// The dialog has been closed by a cancellation from the user.
-        /// </summary>
-        Cancel = 2,
-    };
-}
diff --git a/sources/presentation/Stride.Core.Presentation.Wpf/Services/IModalDialog.cs b/sources/presentation/Stride.Core.Presentation.Wpf/Services/IModalDialog.cs
deleted file mode 100644
index ee759cd60d..0000000000
--- a/sources/presentation/Stride.Core.Presentation.Wpf/Services/IModalDialog.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System.Threading.Tasks;
-
-namespace Stride.Core.Presentation.Services
-{
-    /// <summary>
-    /// An interface representing a modal dialog.
-    /// </summary>
-    public interface IModalDialog
-    {
-        /// <summary>
-        /// Displays the modal dialog. This method returns a task that completes when the user close the dialog.
-        /// </summary>
-        /// <returns>A <see cref="DialogResult"/> value indicating how the user closed the dialog.</returns>
-        Task<DialogResult> ShowModal();
-
-        /// <summary>
-        /// Requests this dialog to close. This method returns immediately and does not wait for the dialog to be closed.
-        /// </summary>
-        /// <param name="result"></param>
-        /// <remarks>This method does not guarantee that the dialog will actually close, a cancel can still occurs.</remarks>
-        void RequestClose(DialogResult result);
-
-        /// <summary>
-        /// Gets or sets a data context for the modal dialog.
-        /// </summary>
-        object DataContext { get; set; }
-    }
-}
diff --git a/sources/presentation/Stride.Core.Presentation/Services/DialogResult.cs b/sources/presentation/Stride.Core.Presentation/Services/DialogResult.cs
new file mode 100644
index 0000000000..b08f1858d7
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Services/DialogResult.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Stride.Core.Presentation.Services;
+
+// TODO: make these enum independent from their System.Windows equivalent
+/// <summary>
+/// An enum representing the result of a dialog invocation.
+/// </summary>
+public enum DialogResult
+{
+    /// <summary>
+    /// The dialog has not been invoked or closed yet.
+    /// </summary>
+    None = 0,
+    /// <summary>
+    /// The dialog has been closed by a validation from the user.
+    /// </summary>
+    Ok = 1,
+    /// <summary>
+    /// The dialog has been closed by a cancellation from the user.
+    /// </summary>
+    Cancel = 2,
+};
diff --git a/sources/presentation/Stride.Core.Presentation/Services/IModalDialog.cs b/sources/presentation/Stride.Core.Presentation/Services/IModalDialog.cs
new file mode 100644
index 0000000000..381d284a4b
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Services/IModalDialog.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Stride.Core.Presentation.Services;
+
+/// <summary>
+/// An interface representing a modal dialog.
+/// </summary>
+public interface IModalDialog
+{
+    /// <summary>
+    /// Displays the modal dialog. This method returns a task that completes when the user close the dialog.
+    /// </summary>
+    /// <returns>A <see cref="DialogResult"/> value indicating how the user closed the dialog.</returns>
+    Task<DialogResult> ShowModal();
+
+    /// <summary>
+    /// Requests this dialog to close. This method returns immediately and does not wait for the dialog to be closed.
+    /// </summary>
+    /// <param name="result"></param>
+    /// <remarks>This method does not guarantee that the dialog will actually close, a cancel can still occurs.</remarks>
+    void RequestClose(DialogResult result);
+
+    /// <summary>
+    /// Gets or sets a data context for the modal dialog.
+    /// </summary>
+    object DataContext { get; set; }
+}

From 5452f997eb737a816ba6d9e47c32abdec21c2b51 Mon Sep 17 00:00:00 2001
From: jklawreszuk <jk.lawreszuk@gmail.com>
Date: Fri, 1 Aug 2025 17:42:23 +0200
Subject: [PATCH 2/2] fixup! feat: Implement Project selection/creation

---
 .../NewOrOpenSessionTemplateCollectionViewModel.cs    |  2 +-
 .../editor/Stride.GameStudio.Avalonia/App.axaml.cs    | 11 +++++------
 .../Services/EditorDialogService.cs                   | 10 ++++++++++
 .../ViewModels/MainViewModel.cs                       |  2 ++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs b/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
index 39a7363f94..11ed5cf643 100644
--- a/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
+++ b/sources/editor/Stride.Core.Assets.Editor.Avalonia/NewOrOpenSessionTemplateCollectionViewModel.cs
@@ -22,7 +22,7 @@ private async Task BrowseForExistingProject()
         var filePath = await EditorDialogHelper.BrowseForExistingProject(serviceProvider);
         if (filePath != null)
         {
-            SelectedTemplate = new ExistingProjectViewModel(ServiceProvider, filePath, RemoveExistingProjects);
+            //SelectedTemplate = new ExistingProjectViewModel(ServiceProvider, filePath, RemoveExistingProjects);
             dialog?.RequestClose(DialogResult.Ok);
         }
     }
diff --git a/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs b/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
index 038b157f01..1f8c297d9f 100644
--- a/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
+++ b/sources/editor/Stride.GameStudio.Avalonia/App.axaml.cs
@@ -103,7 +103,7 @@ public override void OnFrameworkInitializationCompleted()
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            desktop.MainWindow = new ProjectSelectionWindow();
+            desktop.MainWindow = new MainWindow();
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
@@ -126,12 +126,11 @@ public void Restart(UFile? initialPath = null)
         }
     }
 
-    private static object InitializeMainViewModel(UFile? initialPath)
+    private static MainViewModel InitializeMainViewModel(UFile? initialPath)
     {
-        //Switch viewmodel depending the program arguments
-        var viewmodel = new NewOrOpenSessionTemplateCollectionViewModel(InitializeServiceProvider());
-        // if (initialPath is not null)
-        //     vm.OpenCommand.Execute(initialPath);
+        var viewmodel = new MainViewModel(InitializeServiceProvider());
+        if (initialPath is not null)
+            viewmodel.OpenCommand.Execute(initialPath);
         return viewmodel;
     }
 
diff --git a/sources/editor/Stride.GameStudio.Avalonia/Services/EditorDialogService.cs b/sources/editor/Stride.GameStudio.Avalonia/Services/EditorDialogService.cs
index 1e636d2b77..28ad2541bd 100644
--- a/sources/editor/Stride.GameStudio.Avalonia/Services/EditorDialogService.cs
+++ b/sources/editor/Stride.GameStudio.Avalonia/Services/EditorDialogService.cs
@@ -9,6 +9,7 @@
 using Stride.Core.Presentation.Services;
 using Stride.Core.Presentation.ViewModels;
 using Stride.GameStudio.Avalonia.Views;
+using Stride.Core.Assets.Editor.Avalonia;
 
 namespace Stride.GameStudio.Avalonia.Services;
 
@@ -91,6 +92,15 @@ public void ShowProgressWindow(WorkProgressViewModel workProgress)
         }
     }
 
+    public void ShowProjectSelectionWindow()
+    {
+        var project = new ProjectSelectionWindow()
+        {
+            DataContext = new NewOrOpenSessionTemplateCollectionViewModel(serviceProvider)
+        };
+        project.Show();
+    }
+
     public async Task ShowSettingsWindowAsync()
     {
         if (MainWindow is null) return;
diff --git a/sources/editor/Stride.GameStudio.Avalonia/ViewModels/MainViewModel.cs b/sources/editor/Stride.GameStudio.Avalonia/ViewModels/MainViewModel.cs
index c7ad06f1d2..551b47155d 100644
--- a/sources/editor/Stride.GameStudio.Avalonia/ViewModels/MainViewModel.cs
+++ b/sources/editor/Stride.GameStudio.Avalonia/ViewModels/MainViewModel.cs
@@ -48,6 +48,8 @@ public MainViewModel(IViewModelServiceProvider serviceProvider)
 
         Status = new StatusViewModel(ServiceProvider);
         Status.PushStatus("Ready");
+
+        DialogService.ShowProjectSelectionWindow();
     }
 
     public SessionViewModel? Session