diff --git a/app/components/enterprise_edition/banner_component.sass b/app/components/enterprise_edition/banner_component.sass
index 119638a0bb8f..eae18d3bd9b8 100644
--- a/app/components/enterprise_edition/banner_component.sass
+++ b/app/components/enterprise_edition/banner_component.sass
@@ -134,5 +134,8 @@ $op-enterprise-banner-fixed-height-large: 320px
   &--content
     padding: var(--base-size-6) var(--base-size-8)
 
+  &--upsell-buttons
+    gap: var(--base-size-8)
+
   &--dismiss
     margin-left: var(--controlStack-medium-gap-condensed)
diff --git a/app/components/enterprise_edition/upsell_buttons_component.rb b/app/components/enterprise_edition/upsell_buttons_component.rb
index eb2802497ab2..38b04247232c 100644
--- a/app/components/enterprise_edition/upsell_buttons_component.rb
+++ b/app/components/enterprise_edition/upsell_buttons_component.rb
@@ -40,14 +40,19 @@ def initialize(feature_key, show_buy_now: false, **system_arguments)
 
       @system_arguments = system_arguments
       @system_arguments[:align_items] ||= :center
+      @system_arguments[:flex_wrap] ||= :wrap
+      @system_arguments[:classes] = class_names(
+        @system_arguments[:classes],
+        "op-enterprise-banner--upsell-buttons"
+      )
       @feature_key = feature_key
       @show_buy_now = show_buy_now
     end
 
     def call
       flex_layout(**@system_arguments) do |flex|
-        buttons.each_with_index do |button, i|
-          flex.with_column(ml: (i == 0 ? 0 : 2)) do
+        buttons.each do |button|
+          flex.with_column do
             button
           end
         end