diff --git a/frontend/src/global_styles/openproject/_forms.sass b/frontend/src/global_styles/openproject/_forms.sass
index 17180a8c977..2ad2073b2b2 100644
--- a/frontend/src/global_styles/openproject/_forms.sass
+++ b/frontend/src/global_styles/openproject/_forms.sass
@@ -211,15 +211,12 @@ input[type="number"]
 .FormControl-advanced-checkbox-content,
 .FormControl-advanced-radio-content
   display: grid
-  grid-template-columns: auto min-content
+  grid-template-columns: min-content auto min-content
   gap: var(--base-size-8)
   padding: var(--base-size-12)
 
-.FormControl-advanced-checkbox-label-row,
-.FormControl-advanced-radio-label-row
-  display: inline-grid
-  grid-template-columns: min-content auto
-  gap: var(--base-size-8)
+.FormControl-advanced-checkbox-label-text,
+.FormControl-advanced-radio-label-text
   color: var(--fgColor-accent)
 
 .FormControl-advanced-checkbox-icon,
diff --git a/lib/primer/open_project/forms/advanced_check_box.html.erb b/lib/primer/open_project/forms/advanced_check_box.html.erb
index fe8d216ad43..6fd082f30b7 100644
--- a/lib/primer/open_project/forms/advanced_check_box.html.erb
+++ b/lib/primer/open_project/forms/advanced_check_box.html.erb
@@ -1,11 +1,9 @@
 <%= content_tag(:div, class: "FormControl-advanced-checkbox-wrap", hidden: @input.hidden?) do %>
   <%= builder.label(@input.name, **@input.label_arguments) do %>
     <div class="FormControl-advanced-checkbox-content">
+      <%= builder.check_box(@input.name, @input.input_arguments, checked_value, unchecked_value) %>
       <div>
-        <div class="FormControl-advanced-checkbox-label-row">
-          <%= builder.check_box(@input.name, @input.input_arguments, checked_value, unchecked_value) %>
-          <%= @input.label %>
-        </div>
+        <div class="FormControl-advanced-checkbox-label-text"><%= @input.label %></div>
         <% if @input.form_control? %>
           <div class="mt-1">
             <%= render(Caption.new(input: @input)) %>
diff --git a/lib/primer/open_project/forms/advanced_radio_button.html.erb b/lib/primer/open_project/forms/advanced_radio_button.html.erb
index fd1bdb62a47..2d82b6c81a8 100644
--- a/lib/primer/open_project/forms/advanced_radio_button.html.erb
+++ b/lib/primer/open_project/forms/advanced_radio_button.html.erb
@@ -1,11 +1,9 @@
 <%= content_tag(:div, class: "FormControl-advanced-radio-wrap", hidden: @input.hidden?) do %>
   <%= builder.label(@input.name, value: @input.value, **@input.label_arguments) do %>
     <div class="FormControl-advanced-radio-content">
+      <%= builder.radio_button(@input.name, @input.value, **@input.input_arguments) %>
       <div>
-        <div class="FormControl-advanced-radio-label-row">
-          <%= builder.radio_button(@input.name, @input.value, **@input.input_arguments) %>
-          <%= @input.label %>
-        </div>
+        <div class="FormControl-advanced-radio-label-text"><%= @input.label %></div>
         <% if @input.form_control? %>
           <div class="mt-1">
             <%= render(Caption.new(input: @input)) %>