diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index e84b3bdc..06380573 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -859,6 +859,12 @@ function rcube_calendar_ui(settings)
     {
       if (delta) {
         freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta);
+        // skip weekends if in workinhoursonly-mode
+        if (Math.abs(delta) == 1 && freebusy_ui.workinhoursonly) {
+          while (is_weekend(freebusy_ui.start))
+            freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta);
+        }
+        
         freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
       }
       
diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/default/templates/calendar.html
index dd0f3ae9..a878d392 100644
--- a/plugins/calendar/skins/default/templates/calendar.html
+++ b/plugins/calendar/skins/default/templates/calendar.html
@@ -221,7 +221,7 @@
       <button id="shedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
     </div>
     <div class="schedule-options">
-      <label><input type="checkbox" id="schedule-freebusy-wokinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
+      <label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
     </div>
   </div>
   <br style="clear:both;" />