diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php
index 23fc0051..3a6df4fa 100644
--- a/includes/view/ShiftCalendarRenderer.php
+++ b/includes/view/ShiftCalendarRenderer.php
@@ -145,7 +145,8 @@ class ShiftCalendarRenderer
         if (count($this->lanes) == 0) {
             return info(__('No shifts found.'), true);
         }
-        return div('shift-calendar', [
+
+        return div('shift-calendar table-responsive', [
                 $this->renderTimeLane(),
                 $this->renderShiftLanes()
             ]) . $this->renderLegend();
diff --git a/resources/assets/themes/base.less b/resources/assets/themes/base.less
index 74dadc11..1335cd04 100644
--- a/resources/assets/themes/base.less
+++ b/resources/assets/themes/base.less
@@ -233,6 +233,15 @@ table a > .icon-icon_angel {
   -moz-animation: pulse 1s infinite;
 }
 
+.legend .label {
+  white-space: pre-wrap;
+  line-height: 2;
+}
+
+.shift-calendar.table-responsive {
+  overflow-x: inherit;
+}
+
 @keyframes pulse {
   0% {
     transform: rotate(0deg);