diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
index cd1d15aae..b38fad561 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
@@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.note.elements
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -56,20 +55,16 @@ fun AddButtonPreview() {
 
 @Composable
 fun AddButton(
+    modifier: Modifier = Modifier,
     text: Int = R.string.add,
     isActive: Boolean = true,
-    modifier: Modifier = Modifier.padding(start = 3.dp),
     onClick: () -> Unit,
 ) {
     OutlinedButton(
         modifier = modifier,
-        onClick = {
-            if (isActive) {
-                onClick()
-            }
-        },
-        shape = ButtonBorder,
         enabled = isActive,
+        onClick = onClick,
+        shape = ButtonBorder,
         contentPadding = PaddingValues(vertical = 0.dp, horizontal = 16.dp),
     ) {
         Text(text = stringRes(text), textAlign = TextAlign.Center)
@@ -78,20 +73,18 @@ fun AddButton(
 
 @Composable
 fun RemoveButton(
+    modifier: Modifier = Modifier,
+    text: Int = R.string.remove,
     isActive: Boolean = true,
     onClick: () -> Unit,
 ) {
     OutlinedButton(
-        modifier = Modifier.padding(start = 3.dp),
-        onClick = {
-            if (isActive) {
-                onClick()
-            }
-        },
+        modifier = modifier,
+        onClick = onClick,
         shape = ButtonBorder,
         enabled = isActive,
         contentPadding = PaddingValues(vertical = 0.dp, horizontal = 16.dp),
     ) {
-        Text(text = stringRes(R.string.remove))
+        Text(text = stringRes(text))
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt
index 5eef3873f..98fef26ab 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt
@@ -183,9 +183,9 @@ private fun EmojiListOptions(
 
             CrossfadeIfEnabled(targetState = hasAddedThis, label = "EmojiListOptions", accountViewModel = accountViewModel) {
                 if (it != true) {
-                    AddButton { accountViewModel.addEmojiPack(usersEmojiList, emojiPackNote) }
+                    AddButton(modifier = Modifier.padding(start = 3.dp)) { accountViewModel.addEmojiPack(usersEmojiList, emojiPackNote) }
                 } else {
-                    RemoveButton { accountViewModel.removeEmojiPack(usersEmojiList, emojiPackNote) }
+                    RemoveButton(modifier = Modifier.padding(start = 3.dp)) { accountViewModel.removeEmojiPack(usersEmojiList, emojiPackNote) }
                 }
             }
         }