From 83fb6a38bf3630dbf62148130ba82738d24e35ae Mon Sep 17 00:00:00 2001
From: Oliver Tacke <o.tacke@posteo.de>
Date: Wed, 6 May 2026 15:29:14 +0200
Subject: [PATCH] Fix timing dependent failure of theme controls init

---
 assets/templates/view.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/assets/templates/view.html b/assets/templates/view.html
index 38935a21..fce13230 100644
--- a/assets/templates/view.html
+++ b/assets/templates/view.html
@@ -429,9 +429,14 @@
       }
       else {
         waitForH5P(() => {
-          innerWindow.H5P.externalDispatcher.on('initialized', () => {
+          if (innerWindow.H5P.instances?.length) {
             initializeThemeControls();
-          });
+          }
+          else {
+            innerWindow.H5P.externalDispatcher.on('initialized', () => {
+              initializeThemeControls();
+            });
+          }
         });
       }
     }