diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html
index 3d1e9b0d1c..f66e4c6769 100644
--- a/src/pretix/presale/templates/pretixpresale/event/base.html
+++ b/src/pretix/presale/templates/pretixpresale/event/base.html
@@ -29,7 +29,7 @@
             </div>
         </div>
     {% endif %}
-    <div class="container page-header-links">
+    <div class="container page-header-links {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}page-header-links-outside{% endif %}">
         {% if event.settings.locales|length > 1 %}
             {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}
                 <div class="pull-right header-part flip">
diff --git a/src/pretix/static/pretixpresale/scss/_theme.scss b/src/pretix/static/pretixpresale/scss/_theme.scss
index a90dfe0bb4..9e270cfaca 100644
--- a/src/pretix/static/pretixpresale/scss/_theme.scss
+++ b/src/pretix/static/pretixpresale/scss/_theme.scss
@@ -26,7 +26,6 @@
 
 .page-header-links > div.header-part {
   padding-top: 15px;
-  padding-bottom: 15px;
 
   a {
     color: choose-contrast-color($body-bg, white, $link-color);
@@ -36,6 +35,10 @@
   }
 }
 
+.page-header-links-outside > div.header-part {
+  padding-bottom: 15px;
+}
+
 .page-header.logo-large {
   margin: 0 -15px;
 
@@ -69,8 +72,9 @@ h2.content-header {
       border-radius: $border-radius-large;
     }
   }
-  .page-header-links {
-    padding: 0;
+  .page-header-links-outside {
+    padding-left: 0;
+    padding-right: 0;
   }
   .page-header-links > div.header-part {
     @if ($body-bg != #FFFFFF) {
@@ -88,8 +92,6 @@ h2.content-header {
     }
   }
   .page-header .loginbox {
-    @if ($body-bg != #FFFFFF) {
-      padding-top: 0;
-    }
+    padding-top: 0;
   }
 }