diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py
index 5b6ef7394..ec41c10bc 100644
--- a/src/pretix/presale/checkoutflow.py
+++ b/src/pretix/presale/checkoutflow.py
@@ -531,7 +531,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
 
     def post(self, request):
         self.request = request
-        if request.POST.get("giftcard"):
+        if request.POST.get("giftcard") and request.POST.get("payment") == "giftcard":
             # TODO: cross-organizer acceptance, …
             try:
                 gc = GiftCard.objects.get(
diff --git a/src/pretix/presale/templates/pretixpresale/event/order.html b/src/pretix/presale/templates/pretixpresale/event/order.html
index b8a3096fc..da576a3c4 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order.html
@@ -128,6 +128,26 @@
         </div>
         <div class="panel-body">
             {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event download=can_download editable=False %}
+            {% if order.status == "n" and order.total > pending_sum %}
+                <div class="row cart-row">
+                    <div class="col-md-4 col-xs-6">
+                        <strong>{% trans "Successful payments" %}</strong>
+                    </div>
+                    <div class="col-md-3 col-xs-6 col-md-offset-5 price">
+                        <strong>{{ payment_sum_neg|money:event.currency }}</strong>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <div class="row cart-row total">
+                    <div class="col-md-4 col-xs-6">
+                        <strong>{% trans "Pending total" %}</strong>
+                    </div>
+                    <div class="col-md-3 col-xs-6 col-md-offset-5 price">
+                        <strong>{{ pending_sum|money:event.currency }}</strong>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+            {% endif %}
         </div>
     </div>
     {% eventsignal event "pretix.presale.signals.order_info" order=order %}
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 5edb57eb2..e133d065f 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -193,6 +193,7 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TicketPageMixin,
 
         if self.order.status == Order.STATUS_PENDING:
             ctx['pending_sum'] = self.order.pending_sum
+            ctx['payment_sum_neg'] = ctx['pending_sum'] - self.order.total
 
             lp = self.order.payments.last()
             ctx['can_pay'] = False