diff --git a/LANCommander/Components/ScriptEditor.razor b/LANCommander/Components/ScriptEditor.razor
index 40cc432..4bd932b 100644
--- a/LANCommander/Components/ScriptEditor.razor
+++ b/LANCommander/Components/ScriptEditor.razor
@@ -64,7 +64,7 @@
 
 <Space Direction="DirectionVHType.Vertical" Size="@("large")" Style="width: 100%">
     <SpaceItem>
-        <Table TItem="Script" DataSource="@Game.Scripts" HidePagination="true">
+        <Table TItem="Script" DataSource="@Scripts" HidePagination="true">
             <PropertyColumn Property="s => s.Type" />
             <PropertyColumn Property="s => s.CreatedBy">
                 @context.CreatedBy?.UserName
@@ -100,7 +100,10 @@
 </style>
 
 @code {
-    [Parameter] public Game Game { get; set; }
+    [Parameter] public Guid GameId { get; set; }
+    [Parameter] public Guid ArchiveId { get; set; }
+    [Parameter] public ICollection<Script> Scripts { get; set; }
+    [Parameter] public EventCallback<ICollection<Script>> ScriptsChanged { get; set; }
 
     Script Script;
 
@@ -122,8 +125,8 @@
 
     protected override async Task OnInitializedAsync()
     {
-        if (Game.Scripts == null)
-            Game.Scripts = new List<Script>();
+        if (Scripts == null)
+            Scripts = new List<Script>();
 
         Snippets = ScriptService.GetSnippets();
 
@@ -136,7 +139,7 @@
         if (script == null) {
             Script = new Script()
             {
-                GameId = Game.Id
+                GameId = GameId
             };
 
             if (Editor != null)
@@ -200,7 +203,7 @@
 
         var browserOptions = new ArchiveBrowserOptions()
             {
-                ArchiveId = Game.Archives.FirstOrDefault().Id,
+                ArchiveId = ArchiveId,
                 Select = true,
                 Multiple = false
             };
diff --git a/LANCommander/Pages/Games/Edit.razor b/LANCommander/Pages/Games/Edit.razor
index 6badc3c..c094e34 100644
--- a/LANCommander/Pages/Games/Edit.razor
+++ b/LANCommander/Pages/Games/Edit.razor
@@ -108,7 +108,7 @@
         <SpaceItem>
             <Card Title="Scripts">
                 <Body>
-                    <ScriptEditor Game="Game" />
+                    <ScriptEditor @bind-Scripts="Game.Scripts" GameId="Game.Id" ArchiveId="Game.Archives.OrderByDescending(a => a.CreatedOn).FirstOrDefault().Id" />
                 </Body>
             </Card>
         </SpaceItem>
