diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index bb3bd95f0..d4674339f 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -192,7 +192,7 @@
                        ng-click="addressbook.mode.search = true">
               <md-icon>search</md-icon>
             </md-button>
-            <div class="md-flex">{{addressbook.selectedFolder.name}}</div>
+            <div class="sg-folder-name">{{addressbook.selectedFolder.name}}</div>
             <md-menu>
               <md-button class="sg-icon-button" label:aria-label="Sort"
                          ng-click="$mdOpenMenu()">
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index 9e5c1b57c..277114553 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -16,7 +16,7 @@
                    ng-click="mailbox.mode.search = true">
           <md-icon>search</md-icon>
         </md-button>
-        <div class="md-flex">{{mailbox.selectedFolder.name}}</div>
+        <div class="sg-folder-name">{{mailbox.selectedFolder.name}}</div>
         <md-menu>
           <md-button class="sg-icon-button" label:aria-label="Sort"
                      ng-click="$mdOpenMenu()">
diff --git a/UI/WebServerResources/scss/components/toolbar/toolbar.scss b/UI/WebServerResources/scss/components/toolbar/toolbar.scss
index 582e465f3..2c1262bbe 100644
--- a/UI/WebServerResources/scss/components/toolbar/toolbar.scss
+++ b/UI/WebServerResources/scss/components/toolbar/toolbar.scss
@@ -81,6 +81,13 @@ hgroup {
   }
 }
 
+.sg-folder-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex: 1 1 auto;
+}
+
 .sg-toolbar-search {
   padding: $toolbar-padding 0;
 }