diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 957a2835226..557fd0071e3 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -110,6 +110,12 @@ code {
         color: $primary-text-color;
         display: block;
         width: auto;
+
+        &.boolean {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+        }
       }
 
       .label_input,
@@ -141,7 +147,6 @@ code {
       .overridden,
       .recommended,
       .not_recommended {
-        position: absolute;
         margin: 0 4px;
         margin-top: -2px;
       }
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index a8bc4b19211..8380e0ab13b 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -15,7 +15,7 @@ module RecommendedComponent
     return unless options[:recommended]
 
     key = options[:recommended].is_a?(Symbol) ? options[:recommended] : :recommended
-    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t(key, scope: 'simple_form'), class: key)]) }
+    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([tag.span(raw_label_text), tag.span(I18n.t(key, scope: 'simple_form'), class: key)]) }
 
     nil
   end