diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
index c6cc887655..8b5ddb49c9 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
@@ -3,6 +3,7 @@ package chat.simplex.common.views.chatlist
 import SectionCustomFooter
 import SectionDivider
 import SectionItemView
+import SectionView
 import TextIconSpaced
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.*
@@ -262,11 +263,13 @@ fun ModalData.TagListEditor(
         trimmedName.value.isEmpty() ||
         isDuplicateEmojiOrName.value
 
-    SectionItemView(click = { if (tagId == null) createTag() else updateTag() }, disabled = disabled) {
-      Text(
-        generalGetString(if (chat != null) MR.strings.add_to_list else MR.strings.save_list),
-        color = if (disabled) colors.secondary else colors.primary
-      )
+    SectionView {
+      SectionItemView(click = { if (tagId == null) createTag() else updateTag() }, disabled = disabled) {
+        Text(
+          generalGetString(if (chat != null) MR.strings.add_to_list else MR.strings.save_list),
+          color = if (disabled) colors.secondary else colors.primary
+        )
+      }
     }
     val showErrorMessage = isDuplicateEmojiOrName.value && saving.value != false
     SectionCustomFooter {