diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index eda7cc4b6..dafc45266 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -6,7 +6,7 @@
 
       <a id="peertube-title" [routerLink]="['/videos/list']" title="Homepage">
         <span class="icon icon-logo"></span>
-        {{ instanceName }}
+        <span class="instance-name">{{ instanceName }}</span>
       </a>
     </div>
 
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index d502d63b5..24c4f66c7 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -31,11 +31,12 @@
   display: flex;
 
   .top-left-block {
-    width: $menu-width;
     z-index: 1001;
     height: $header-height;
     display: flex;
     align-items: center;
+    flex: 1;
+    min-width: 0;
 
     .icon {
       @include icon(22px);
@@ -47,13 +48,21 @@
     }
 
     #peertube-title {
+      @include disable-default-a-behaviour;
+      width: 100%;
       font-size: 20px;
       font-weight: $font-bold;
       color: inherit !important;
       display: flex;
       align-items: center;
+      overflow: hidden;
 
-      @include disable-default-a-behaviour;
+      .instance-name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 100%;
+      }
 
       .icon.icon-logo {
         display: inline-block;
@@ -76,8 +85,8 @@
     height: $header-height;
     display: flex;
     align-items: center;
-    flex-grow: 1;
     justify-content: flex-end;
+    white-space: nowrap;
   }
 }