diff --git a/PS2_Manager/Core/Game.cs b/PS2_Manager/Core/Game.cs
index a7fdefe..3fece8f 100644
--- a/PS2_Manager/Core/Game.cs
+++ b/PS2_Manager/Core/Game.cs
@@ -44,6 +44,15 @@ public class Game
         }
     }
 
+    public void ChangeName(string newName)
+    {
+        this.Name = newName;
+        string targetDirectory = settings.library_path.GetValue<string>();
+        string newFileName = $"{this.GameID}.{this.Name}.iso";
+        string destPath = Path.Combine(Path.Combine(targetDirectory, "DVD"), newFileName);
+        File.Move(this.GamePath, destPath);
+    }
+
     public string GetGameTitle()
     {
         string url = $"http://localhost:3000/search/{this.GameID}";
diff --git a/PS2_Manager/EditGame.axaml b/PS2_Manager/EditGame.axaml
index 0337cb3..11f81e5 100644
--- a/PS2_Manager/EditGame.axaml
+++ b/PS2_Manager/EditGame.axaml
@@ -21,8 +21,10 @@
             </StackPanel>
         </ScrollViewer>
         <Grid Grid.Row="1" ColumnDefinitions="*,*">
-            <Button Content="Undo" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            <Button Content="Save" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <Button Content="Undo" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Click="Edit_OnClick"/>
+            <Button Content="Save" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Click="Save_OnClick"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/PS2_Manager/EditGame.axaml.cs b/PS2_Manager/EditGame.axaml.cs
index f41584f..8370992 100644
--- a/PS2_Manager/EditGame.axaml.cs
+++ b/PS2_Manager/EditGame.axaml.cs
@@ -39,8 +39,7 @@ public partial class EditGame : UserControl
 
     private void DisplayNameBox_OnTextChanged(object? sender, TextChangedEventArgs e)
     {
-        this.game.Name = DisplayNameBox.Text;
-        MainWindow.RefreshGamesListTrigger.Invoke(null, EventArgs.Empty);
+        
     }
 
     private void ChecksumButtonOnClick(object? sender, RoutedEventArgs e)
@@ -74,4 +73,15 @@ public partial class EditGame : UserControl
 
         Console.WriteLine("Hashing started...");
     }
+
+    private void Save_OnClick(object? sender, RoutedEventArgs e)
+    {
+        this.game.ChangeName(DisplayNameBox.Text);
+        MainWindow.RefreshGamesListTrigger?.Invoke(null, EventArgs.Empty);
+    }
+
+    private void Edit_OnClick(object? sender, RoutedEventArgs e)
+    {
+        DisplayNameBox.Text = game.Name;
+    }
 }
\ No newline at end of file
diff --git a/PS2_Manager/MainWindow.axaml.cs b/PS2_Manager/MainWindow.axaml.cs
index bf22296..d9ff494 100644
--- a/PS2_Manager/MainWindow.axaml.cs
+++ b/PS2_Manager/MainWindow.axaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -81,6 +82,7 @@ public partial class MainWindow : Window
                 new Game(file, true);
             Games.Add(newGame);
         }
+        Games = Games.OrderBy(game => game.Name).ToList();
         GamesList.ItemsSource = Games;
     }