diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 05df54facf..8d06326d61 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -946,7 +946,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
         // wait for automation to appear in entity registry when creating a new automation
         if (entityRegPromise) {
           try {
-            const automation = await promiseTimeout(2000, entityRegPromise);
+            const automation = await promiseTimeout(5000, entityRegPromise);
             entityId = automation.entity_id;
           } catch (e) {
             if (e instanceof Error && e.name === "TimeoutError") {
diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts
index 8f7a639a32..397d01dc34 100644
--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -917,7 +917,7 @@ export class HaScriptEditor extends SubscribeMixin(
         // wait for new script to appear in entity registry
         if (entityRegPromise) {
           try {
-            const script = await promiseTimeout(2000, entityRegPromise);
+            const script = await promiseTimeout(5000, entityRegPromise);
             entityId = script.entity_id;
           } catch (e) {
             entityId = undefined;