diff --git a/LANCommander/Components/ScriptEditor.razor b/LANCommander/Components/ScriptEditor.razor
index ab35a6d..c1f39b8 100644
--- a/LANCommander/Components/ScriptEditor.razor
+++ b/LANCommander/Components/ScriptEditor.razor
@@ -58,11 +58,18 @@
     ICollection<Script> Scripts { get; set; } = new List<Script>();
 
     protected override async Task OnParametersSetAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
     {
         if (GameId != Guid.Empty)
             Scripts = await ScriptService.Get(s => s.GameId == GameId).ToListAsync();
         else if (RedistributableId != Guid.Empty)
             Scripts = await ScriptService.Get(s => s.RedistributableId == RedistributableId).ToListAsync();
+
+        await InvokeAsync(StateHasChanged);
     }
 
     private async void Edit(Guid? scriptId = null)
@@ -89,10 +96,8 @@
 
         modalRef.OnOk = async (script) =>
         {
-            
+            await LoadData();
         };
-
-        StateHasChanged();
     }
 
     private async void Delete(Script script = null)
diff --git a/LANCommander/Components/ScriptEditorDialog.razor b/LANCommander/Components/ScriptEditorDialog.razor
index 8904e42..55050a4 100644
--- a/LANCommander/Components/ScriptEditorDialog.razor
+++ b/LANCommander/Components/ScriptEditorDialog.razor
@@ -85,6 +85,16 @@
     {
         if (Options.ScriptId != Guid.Empty)
             Script = await ScriptService.Get(Options.ScriptId);
+        else if (Options.GameId != Guid.Empty)
+            Script = new Script()
+            {
+                GameId = Options.GameId
+            };
+        else if (Options.RedistributableId != Guid.Empty)
+            Script = new Script()
+            {
+                RedistributableId = Options.RedistributableId
+            };
 
         Snippets = ScriptService.GetSnippets();
     }