diff --git a/src/app/components/chat/chat.component.html b/src/app/components/chat/chat.component.html
index c80c06b8..377dc3f7 100644
--- a/src/app/components/chat/chat.component.html
+++ b/src/app/components/chat/chat.component.html
@@ -177,7 +177,7 @@
         }
       </div>
       } @else {
-      <div style="display: flex; align-items: center">
+      <div style="display: flex; align-items: center; min-width: 0; flex: 1;">
         @let isSessionLoading = uiStateService.isSessionLoading() | async; @if (isSessionLoading ===
         false) {
         <div class="toolbar-session-text">{{ i18n.sessionIdLabel }}</div>
diff --git a/src/app/components/chat/chat.component.scss b/src/app/components/chat/chat.component.scss
index d216ce12..7de0390f 100644
--- a/src/app/components/chat/chat.component.scss
+++ b/src/app/components/chat/chat.component.scss
@@ -516,7 +516,10 @@ button {
   line-height: 20px;
   letter-spacing: 0.25px;
   margin-left: 5px;
-  flex-shrink: 0;
+  flex-shrink: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .toolbar-icon {