diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c
index 413789a274..e6a55fae55 100644
--- a/gtk/gtkmenusectionbox.c
+++ b/gtk/gtkmenusectionbox.c
@@ -393,6 +393,26 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
       gtk_box_reorder_child_after (GTK_BOX (box->item_box), widget, sibling);
     }
 
+  if (box->circular)
+    {
+      GtkWidget *c1, *c2, *c3;
+
+      /* special-case the n > 2 case */
+      c1 = gtk_widget_get_first_child (GTK_WIDGET (box->item_box));
+      if ((c2 = gtk_widget_get_next_sibling (c1)) != NULL &&
+          (c3 = gtk_widget_get_next_sibling (c2)) != NULL)
+        {
+          gtk_widget_set_halign (c1, GTK_ALIGN_START);
+          while (c3 != NULL)
+            {
+              gtk_widget_set_halign (c2, GTK_ALIGN_CENTER);
+              c2 = c3;
+              c3 = gtk_widget_get_next_sibling (c3);
+            }
+          gtk_widget_set_halign (c2, GTK_ALIGN_END);
+        }
+    }
+
   gtk_menu_section_box_schedule_separator_sync (box);
 }
 
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 4a81fc0401..e26cadbad8 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4390,7 +4390,7 @@ popover.menu {
   }
 
   & box.circular-buttons {
-    padding: 6px 0;
+    padding: 6px 20px;
 
     button.circular.image-button.model {
       @extend %list_button;