diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
index c641b35ca8..d1d2a3380b 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
@@ -121,6 +121,11 @@ fun ModalData.UserWallpaperEditor(
         },
         onChooseType = onChooseType
       )
+    }
+
+    SectionDividerSpaced()
+
+    SectionView {
       WallpaperSetupView(
         themeModeOverride.value.type,
         CurrentColors.collectAsState().value.base,
@@ -362,6 +367,11 @@ fun ModalData.ChatWallpaperEditor(
           }
         },
       )
+    }
+
+    SectionDividerSpaced()
+
+    SectionView {
       WallpaperSetupView(
         themeModeOverride.value.type,
         CurrentColors.collectAsState().value.base,