diff --git a/src/app/components/current-user/current-user.component.html b/src/app/components/current-user/current-user.component.html
index 29e77d41d..638f9230b 100644
--- a/src/app/components/current-user/current-user.component.html
+++ b/src/app/components/current-user/current-user.component.html
@@ -1,13 +1,11 @@
 <div>
     <div title="{{ user?.id }}">
-        <span>
-            <span class="current-user__full-name">{{ userName }}</span>
-            <span
-                class="current-user__avatar am-avatar am-avatar--light"
-                [matMenuTriggerFor]="userMenu">
-                    {{ userInitials }}
-            </span>
-        </span>
+        <div class="current-user__full-name">{{ userName }}</div>
+        <div
+            class="current-user__avatar am-avatar am-avatar--light"
+            [matMenuTriggerFor]="userMenu">
+                {{ userInitials }}
+        </div>
     </div>
 
     <mat-menu #userMenu="matMenu" [overlapTrigger]="false">
diff --git a/src/app/components/current-user/current-user.component.scss b/src/app/components/current-user/current-user.component.scss
index 7aae7f531..b301ce7bc 100644
--- a/src/app/components/current-user/current-user.component.scss
+++ b/src/app/components/current-user/current-user.component.scss
@@ -33,4 +33,17 @@ $am-avatar-dark-bg: rgba(black, .15);
             background: $am-avatar-dark-bg;
         }
     }
+
+    .current-user__full-name {
+        width: 100px;
+        text-align: right;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display:inline-block;
+        height: 20px;
+        font-size: 14px;
+        line-height: 1.43;
+        letter-spacing: -0.2px;
+    }
 }