diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
index ad834319f..c7cdb5a96 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
@@ -62,7 +62,7 @@
         '      </span>',
         //     Location
         '      <div class="secondary" ng-if="'+p+'block.component.c_location">',
-        '        <md-icon>place</md-icon> {{'+p+'block.component.c_location}}',
+        '        <md-icon>place</md-icon> <span ng-bind="'+p+'block.component.c_location"></span>',
         '      </div>',
         '    </div>',
         '  </div>',
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
index 3f6237f65..3c0ae7285 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
@@ -56,11 +56,11 @@
         '      </span>',
         //     Time
         '      <div class="secondary" ng-if="::!component.c_isallday">',
-        '        <md-icon>access_time</md-icon> {{::component.starthour}}',
+        '        <md-icon>access_time</md-icon> <span ng-bind="::component.starthour"></span>',
         '      </div>',
         //     Location
         '      <div class="secondary" ng-if="::component.c_location">',
-        '        <md-icon>place</md-icon> {{::component.c_location}}',
+        '        <md-icon>place</md-icon> <span ng-bind="::component.c_location"></span>',
         '      </div>',
         '</div>'
       ].join('');
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index c2b318d81..f5e39fa33 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -387,6 +387,9 @@ $quarter_height: 10px;
 
     .secondary { // location in days view, hours in month view
       font-weight: $sg-font-light;
+      span {
+        word-break: break-all;
+      }
     }
 
     .sg-category {