diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditorView.axaml.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditorView.axaml.cs
index efd5e13..e9ab3bf 100644
--- a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditorView.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditorView.axaml.cs
@@ -15,4 +15,9 @@ public partial class GitLabRepoWorkspaceConfigEditorView : AvaloniaFlyoutBase
         DataContext = settings;
         InitializeComponent();
     }
+
+    protected override object? GetResult()
+    {
+        return Settings;
+    }
 }
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspace.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspace.cs
index a1d705f..25b7043 100644
--- a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspace.cs
+++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspace.cs
@@ -24,7 +24,8 @@ internal class LocalFolderWorkspace(LocalFolderWorkspaceConfig config) : IWorksp
         rawUpdateInfos = await GetContent(ConfigX.FileLocationUpdateJson);
         UpdateInfos = UpdateInfos.Parse(rawUpdateInfos);
 
-        ConfigX.FolderName = Path.GetFileName(ConfigX.RootFolderPath);
+        if (string.IsNullOrWhiteSpace(ConfigX.FolderName))
+            ConfigX.FolderName = Path.GetFileName(ConfigX.RootFolderPath);
 
         return InstallInfos != null && UpdateInfos != null;
     }
diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml
index 6d3849e..7a7c12e 100644
--- a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml
+++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml
@@ -15,6 +15,9 @@
   
   <dialogs:AvaloniaFlyoutBase.MainContent>
     <StackPanel Spacing="6">
+      <Label Target="TextBoxName" Content="{x:Static langRes:GeneralLangRes.Name}"/>
+      <TextBox Name="TextBoxName" Text="{Binding FolderName}"/>
+
       <Label Target="TextBoxRootFolderPath" Content="{x:Static langRes:GeneralLangRes.RootFolderPath}"/>
       <Grid
         ColumnDefinitions="*,Auto"
diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml.cs
index 31e0fcb..a58815e 100644
--- a/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/LocalFolder/LocalFolderWorkspaceConfigEditorView.axaml.cs
@@ -22,6 +22,11 @@ public partial class LocalFolderWorkspaceConfigEditorView : AvaloniaFlyoutBase
         ButtonSearch.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.opened_folder);
     }
 
+    protected override object? GetResult()
+    {
+        return Settings;
+    }
+
     private async void ButtonSearch_OnClick(object? sender, RoutedEventArgs e)
     {
         if (TopLevel.GetTopLevel(this) is not { } topLevel)
@@ -33,7 +38,12 @@ public partial class LocalFolderWorkspaceConfigEditorView : AvaloniaFlyoutBase
             AllowMultiple = false,
         });
 
-        if (filePaths.Count >= 1)
-            TextBoxRootFolderPath.Text = filePaths[0].Path.AbsolutePath;
+        if (filePaths.Count < 1)
+            return;
+        
+        TextBoxRootFolderPath.Text = filePaths[0].Path.AbsolutePath;
+        
+        if (string.IsNullOrWhiteSpace(TextBoxName.Text))
+            TextBoxName.Text = filePaths[0].Name;
     }
 }
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
index 4aaa20b..50b8791 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Media;
@@ -7,6 +8,7 @@ using ModpackUpdater.Apps.Manager.Api.Plugins.Features;
 using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
 using ModpackUpdater.Apps.Manager.Settings;
 using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow;
+using Pilz.Extensions;
 using Pilz.Features;
 using Pilz.UI.AvaloniaUI.Features;
 using Pilz.UI.Symbols;
@@ -28,6 +30,8 @@ public partial class MainWindow : Window, IMainApi
     public MainWindow()
     {
         InitializeComponent();
+
+        Title = $"{Title} (v{Assembly.GetExecutingAssembly().GetAppVersion().ToShortString()})";
         
         GridMain.DataContext = Model;