From 7709fa317b2878b68cdc3f68484f4756a59731c9 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Tue, 31 Mar 2026 20:19:04 +0200
Subject: [PATCH] Enhance world background mode application logic

---
 src/app/App.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index e0c31c6b..7c911bf1 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1900,10 +1900,12 @@ export function App({ store, initialStatusMessage }: AppProps) {
 
   const applyWorldBackgroundMode = (mode: WorldBackgroundMode, imageAssetId?: string) => {
     if (mode === "image") {
+      const currentBackgroundAssetId =
+        editorState.document.world.background.mode === "image" ? editorState.document.world.background.assetId : null;
       const nextImageAssetId =
         imageAssetId ??
-        (editorState.document.world.background.mode === "image"
-          ? editorState.document.world.background.assetId
+        (currentBackgroundAssetId !== null && editorState.document.assets[currentBackgroundAssetId]?.kind === "image"
+          ? currentBackgroundAssetId
           : imageAssetList[0]?.id);
 
       if (nextImageAssetId === undefined) {