diff --git a/calendar/js/app.js b/calendar/js/app.js
index 9934ac12ba..55fa3376f1 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3990,6 +3990,9 @@ jQuery.extend(app.classes.calendar,{
 			scroll: function(delta)
 			{
 				var d = new Date(app.calendar.state.date);
+				// Set day to 15 so we don't get overflow on short months
+				// eg. Aug 31 + 1 month = Sept 31 -> Oct 1
+				d.setUTCDate(15);
 				d.setUTCMonth(d.getUTCMonth() + delta);
 				return d;
 			}