diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index ddb2465246..15ddac8bc4 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -34,7 +34,12 @@
                     <div class="col-md-4 col-md-offset-4 col-xs-12">
                         <a class="btn btn-block btn-primary btn-lg"
                                 href="{% eventurl request.event "presale:event.checkout.start" %}">
-                            <i class="fa fa-shopping-cart"></i> {% trans "Proceed with checkout" %}
+                            {% if has_addon_choices %}
+                                <i class="fa fa-shopping-cart"></i> {% trans "Continue" %}
+                                </a>
+                            {% else %}
+                                <i class="fa fa-shopping-cart"></i> {% trans "Proceed with checkout" %}
+                            {% endif %}
                         </a>
                     </div>
                     <div class="clearfix"></div>
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py
index 38896a8d4e..813be0f97e 100644
--- a/src/pretix/presale/views/__init__.py
+++ b/src/pretix/presale/views/__init__.py
@@ -109,7 +109,7 @@ class CartMixin:
             'payment_fee_tax_rate': payment_fee_tax_rate,
             'answers': answers,
             'minutes_left': minutes_left,
-            'first_expiry': first_expiry
+            'first_expiry': first_expiry,
         }
 
     def get_payment_fee(self, total):
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 9725ebafd3..0a9f7764dc 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -21,7 +21,7 @@ from pytz import timezone
 from pretix.base.models import ItemVariation
 from pretix.multidomain.urlreverse import eventreverse
 
-from . import CartMixin, EventViewMixin
+from . import CartMixin, EventViewMixin, get_cart
 
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
 
@@ -108,6 +108,7 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView):
         context['vouchers_exist'] = vouchers_exist
 
         context['cart'] = self.get_cart()
+        context['has_addon_choices'] = get_cart(self.request).filter(item__addons__isnull=False).exists()
 
         context['frontpage_text'] = str(self.request.event.settings.frontpage_text)
         return context