diff --git a/app/konto/bestellungen/[orderNumber]/page.tsx b/app/konto/bestellungen/[orderNumber]/page.tsx
index 5f2f945..ca1eadf 100644
--- a/app/konto/bestellungen/[orderNumber]/page.tsx
+++ b/app/konto/bestellungen/[orderNumber]/page.tsx
@@ -89,8 +89,6 @@ export default async function KontoBestellungDetailPage({ params }: { params: Pr
             </div>
           </div>
 
-          {canSwitchPayment && <SwitchPaymentButton orderNumber={order.orderNumber} />}
-
           {order.trackingNumber && (
             <div className="flex flex-col gap-1 w-full">
               <p className="text-label text-text-muted">Sendungsverfolgung{order.carrier ? ` (${CARRIER_LABELS[order.carrier] ?? order.carrier})` : ""}</p>
@@ -243,12 +241,17 @@ export default async function KontoBestellungDetailPage({ params }: { params: Pr
             )}
           </div>
 
-          {action && (
-            <OrderActionButton
-              orderNumber={order.orderNumber}
-              action={action}
-              items={order.items.map((item) => ({ product: item.product, productName: item.productName, quantity: item.quantity }))}
-            />
+          {(action || canSwitchPayment) && (
+            <div className="flex flex-wrap gap-3 items-start w-full">
+              {action && (
+                <OrderActionButton
+                  orderNumber={order.orderNumber}
+                  action={action}
+                  items={order.items.map((item) => ({ product: item.product, productName: item.productName, quantity: item.quantity }))}
+                />
+              )}
+              {canSwitchPayment && <SwitchPaymentButton orderNumber={order.orderNumber} />}
+            </div>
           )}
         </Reveal>
       </main>