diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js
index d8132a6d0..bf24a7e6a 100644
--- a/src/UI/Calendar/CalendarView.js
+++ b/src/UI/Calendar/CalendarView.js
@@ -160,7 +160,8 @@ module.exports = Marionette.ItemView.extend({
                 allDay      : false,
                 statusLevel : self._getStatusLevel(model, end),
                 downloading : QueueCollection.findEpisode(model.get('id')),
-                model       : model
+                model       : model,
+                sortOrder   : (model.get('seasonNumber') == 0 ? 1000000 : model.get('seasonNumber') * 10000) + model.get('episodeNumber')
             };
 
             events.push(event);
diff --git a/src/UI/JsLibraries/fullcalendar.js b/src/UI/JsLibraries/fullcalendar.js
index 015caca2b..7cd7aca2e 100644
--- a/src/UI/JsLibraries/fullcalendar.js
+++ b/src/UI/JsLibraries/fullcalendar.js
@@ -4439,7 +4439,8 @@ function compareSegs(seg1, seg2) {
 	return seg1.eventStartMS - seg2.eventStartMS || // earlier events go first
 		seg2.eventDurationMS - seg1.eventDurationMS || // tie? longer events go first
 		seg2.event.allDay - seg1.event.allDay || // tie? put all-day events first (booleans cast to 0/1)
-		(seg1.event.title || '').localeCompare(seg2.event.title); // tie? alphabetically by title
+		(seg1.event.title || '').localeCompare(seg2.event.title) || // tie? alphabetically by title
+        seg1.event.sortOrder - seg2.event.sortOrder; // tie? use sortOrder
 }
 
 fc.compareSegs = compareSegs; // export