diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index bbd982f6f4..0b441632d8 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -104,11 +104,9 @@
                 <div class="navbar-header">
                     <a class="navbar-brand" href="{% url "control:index" %}">
                         <img src="{% static "pretixbase/img/pretix-icon-white-mini.svg" %}" />
-                        {% if not request.event and not request.organizer %}
-                            <span>
-                                {{ settings.PRETIX_INSTANCE_NAME }}
-                            </span>
-                        {% endif %}
+                        <span class="{% if request.event or request.organizer %}visible-lg-inline-block{% endif %}">
+                            {{ settings.PRETIX_INSTANCE_NAME }}
+                        </span>
                     </a>
                     {% if request.organizer %}
                         <a class="navbar-context-breadcrumb" href="{% url "control:organizer" organizer=request.organizer.slug %}">
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index 30a82d3caf..5af2a49100 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -40,6 +40,9 @@ nav.navbar {
         margin: 0 0 0 10px;
         .navbar-brand {
             position: relative;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
             padding-bottom: 10px;
             padding-top: 10px;
             padding-left: 10px;
@@ -51,7 +54,7 @@ nav.navbar {
                 vertical-align: top;
             }
             span {
-                padding: 4px 8px 6px; // Optical alignment next to logo
+                padding: 5px 0 6px 8px; // Optical alignment next to logo
                 display: inline-block;
             }
         }