diff --git a/web/src/features/menu/context/components/ContextButton.tsx b/web/src/features/menu/context/components/ContextButton.tsx
index 9ea3eee..312ddf3 100644
--- a/web/src/features/menu/context/components/ContextButton.tsx
+++ b/web/src/features/menu/context/components/ContextButton.tsx
@@ -105,25 +105,27 @@ const ContextButton: React.FC<{
           >
             <Group position="apart" w="100%" noWrap>
               <Stack className={classes.buttonStack}>
-                <Group className={classes.buttonGroup}>
-                  {button?.icon && (
-                    <Stack className={classes.buttonIconContainer}>
-                      {typeof button.icon === 'string' && isIconUrl(button.icon) ? (
-                        <img src={button.icon} className={classes.iconImage} alt="Missing img" />
-                      ) : (
-                        <FontAwesomeIcon
-                          icon={button.icon as IconProp}
-                          fixedWidth
-                          size="lg"
-                          style={{ color: button.iconColor }}
-                        />
-                      )}
-                    </Stack>
-                  )}
-                  <Text className={classes.buttonTitleText}>
-                    <ReactMarkdown components={MarkdownComponents}>{button.title || buttonKey}</ReactMarkdown>
-                  </Text>
-                </Group>
+                {(button.title || Number.isNaN(+buttonKey)) && (
+                  <Group className={classes.buttonGroup}>
+                    {button?.icon && (
+                      <Stack className={classes.buttonIconContainer}>
+                        {typeof button.icon === 'string' && isIconUrl(button.icon) ? (
+                          <img src={button.icon} className={classes.iconImage} alt="Missing img" />
+                        ) : (
+                          <FontAwesomeIcon
+                            icon={button.icon as IconProp}
+                            fixedWidth
+                            size="lg"
+                            style={{ color: button.iconColor }}
+                          />
+                        )}
+                      </Stack>
+                    )}
+                    <Text className={classes.buttonTitleText}>
+                      <ReactMarkdown components={MarkdownComponents}>{button.title || buttonKey}</ReactMarkdown>
+                    </Text>
+                  </Group>
+                )}
                 {button.description && (
                   <Text className={classes.description}>
                     <ReactMarkdown components={MarkdownComponents}>{button.description}</ReactMarkdown>