diff --git a/ts/deckoptions/CheckBoxRow.svelte b/ts/deckoptions/CheckBoxRow.svelte
index 3db4cf7cc..20478023f 100644
--- a/ts/deckoptions/CheckBoxRow.svelte
+++ b/ts/deckoptions/CheckBoxRow.svelte
@@ -18,10 +18,12 @@
 <Row>
     <Col>
         <CheckBox bind:value
-            ><slot />
-            {#if markdownTooltip}<HelpPopup
-                    html={marked(markdownTooltip)}
-                />{/if}</CheckBox
+            ><span
+                ><slot />
+                {#if markdownTooltip}<HelpPopup
+                        html={marked(markdownTooltip)}
+                    />{/if}</span
+            ></CheckBox
         >
     </Col>
     <Col grow={false}>
diff --git a/ts/deckoptions/EnumSelectorRow.svelte b/ts/deckoptions/EnumSelectorRow.svelte
index e7cee2fbd..fdf717aa8 100644
--- a/ts/deckoptions/EnumSelectorRow.svelte
+++ b/ts/deckoptions/EnumSelectorRow.svelte
@@ -21,7 +21,7 @@
 
 <Row>
     <Col size={7}>
-        <slot /><HelpPopup html={marked(markdownTooltip)} />
+        <span><slot /><HelpPopup html={marked(markdownTooltip)} /></span>
     </Col>
     <Col {breakpoint} size={5}>
         <EnumSelector bind:value {choices} />
diff --git a/ts/deckoptions/SpinBoxFloatRow.svelte b/ts/deckoptions/SpinBoxFloatRow.svelte
index 7fcd046e0..38d0400d0 100644
--- a/ts/deckoptions/SpinBoxFloatRow.svelte
+++ b/ts/deckoptions/SpinBoxFloatRow.svelte
@@ -19,7 +19,7 @@
 
 <Row>
     <Col size={7}>
-        <slot /><HelpPopup html={marked(markdownTooltip)} />
+        <span><slot /><HelpPopup html={marked(markdownTooltip)} /></span>
     </Col>
     <Col size={5}>
         <SpinBoxFloat bind:value {min} {max} />
diff --git a/ts/deckoptions/SpinBoxRow.svelte b/ts/deckoptions/SpinBoxRow.svelte
index eeb2d4d86..b4a6286c7 100644
--- a/ts/deckoptions/SpinBoxRow.svelte
+++ b/ts/deckoptions/SpinBoxRow.svelte
@@ -19,7 +19,7 @@
 
 <Row>
     <Col size={7}>
-        <slot /><HelpPopup html={marked(markdownTooltip)} />
+        <span><slot /><HelpPopup html={marked(markdownTooltip)} /></span>
     </Col>
     <Col size={5}>
         <SpinBox bind:value {min} {max} />
diff --git a/ts/deckoptions/StepsInputRow.svelte b/ts/deckoptions/StepsInputRow.svelte
index c11b11edb..c5df6e8cc 100644
--- a/ts/deckoptions/StepsInputRow.svelte
+++ b/ts/deckoptions/StepsInputRow.svelte
@@ -17,7 +17,7 @@
 
 <Row>
     <Col size={7}>
-        <slot /><HelpPopup html={marked(markdownTooltip)} />
+        <span><slot /><HelpPopup html={marked(markdownTooltip)} /></span>
     </Col>
     <Col size={5}>
         <StepsInput bind:value />