diff --git a/lib/client/vanilla/editor.tsx b/lib/client/vanilla/editor.tsx
index c7ac9025..db443290 100644
--- a/lib/client/vanilla/editor.tsx
+++ b/lib/client/vanilla/editor.tsx
@@ -385,8 +385,7 @@ function Editor({ standaloneServer = false }) {
                 setOpen={setSelectOpen}
                 onChange={(e) => {
                   const index = themes.findIndex((r) => r.name === e)
-                  loadThemeComponents(index)
-                  setThemeIndex(index)
+                  loadThemeComponents(index).then(() => setThemeIndex(index))
                 }}
               />
             </div>