diff --git a/.github/workflows/run-luau-tests.yml b/.github/workflows/run-luau-tests.yml
index e7e22feb..e9a9c7bb 100644
--- a/.github/workflows/run-luau-tests.yml
+++ b/.github/workflows/run-luau-tests.yml
@@ -25,8 +25,8 @@ jobs:
   build:
     if: ${{ !github.event.pull_request.draft }}
     name: Build testing place
-    runs-on: ubuntu-24.04
-    timeout-minutes: 1
+    runs-on: windows-latest
+    timeout-minutes: 2
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.1.7
diff --git a/src/DialogueEditor/components/Toolbar/init.luau b/src/DialogueEditor/components/Toolbar/init.luau
index cff95a1e..943bf541 100644
--- a/src/DialogueEditor/components/Toolbar/init.luau
+++ b/src/DialogueEditor/components/Toolbar/init.luau
@@ -68,9 +68,21 @@ local function Toolbar(props: ToolbarProps)
 
       historyIdentifier = beginHistoryRecording(`Add {type:lower()} to NPC`);
 
+      local targetFolder = selectedScript:FindFirstChild(`{type}s`);
+      if not targetFolder then
+
+        local newTargetFolder = Instance.new("Folder");
+        newTargetFolder.Name = `{type}s`;
+        newTargetFolder.Parent = selectedScript;
+        targetFolder = newTargetFolder;
+
+      end;
+
+      assert(targetFolder); -- To silence the type checker.
+
       -- Find a name for the content script.
       local targetPriority = 1;
-      for _, instance in selectedScript:GetChildren() do
+      for _, instance in targetFolder:GetChildren() do
         
         local comparedName = tonumber(instance.Name);
         if comparedName and comparedName >= targetPriority then
@@ -93,16 +105,6 @@ local function Toolbar(props: ToolbarProps)
 
       end;
 
-      local targetFolder = selectedScript:FindFirstChild(`{type}s`);
-      if not targetFolder then
-
-        local newTargetFolder = Instance.new("Folder");
-        newTargetFolder.Name = `{type}s`;
-        newTargetFolder.Parent = selectedScript;
-        targetFolder = newTargetFolder;
-
-      end;
-
       newContentScript.Parent = targetFolder;
 
     end;