diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js
index 825a64114..779f8f892 100644
--- a/app/soapbox/features/forms/index.js
+++ b/app/soapbox/features/forms/index.js
@@ -241,7 +241,7 @@ export class ColorWithPicker extends ImmutablePureComponent {
     return (
       <div className='label_input__color'>
         <label>{label}</label>
-        <button id={buttonId} className='color-swatch' style={{ background: value }} value={value} onClick={this.onToggle} />
+        <div id={buttonId} className='color-swatch' style={{ background: value }} value={value} onClick={this.onToggle} />
         <Overlay show={active} placement={placement} target={this}>
           <ColorPicker value={value} onChange={onChange} onClose={this.onHidePicker} />
         </Overlay>
diff --git a/app/styles/forms.scss b/app/styles/forms.scss
index bce0cf97b..11b9b9b98 100644
--- a/app/styles/forms.scss
+++ b/app/styles/forms.scss
@@ -380,7 +380,8 @@ code {
 
   button,
   .button,
-  .block-button {
+  .block-button,
+  .color-swatch {
     display: block;
     width: 100%;
     border: 0;
@@ -453,7 +454,6 @@ code {
         width: 32px;
         height: 16px;
         margin-left: 12px;
-        display: inline-block;
       }
     }