diff --git a/src/UI/Calendar/UpcomingItemViewTemplate.html b/src/UI/Calendar/UpcomingItemViewTemplate.html
index bfb5daca1..7c42fdfe2 100644
--- a/src/UI/Calendar/UpcomingItemViewTemplate.html
+++ b/src/UI/Calendar/UpcomingItemViewTemplate.html
@@ -8,6 +8,11 @@
         <h4>{{title}}</h4>
     </a>
     {{/with}}
-    <p>{{StartTime airDateUtc}} {{ShortDate airDateUtc}}<span class="pull-right">{{seasonNumber}}x{{Pad2 episodeNumber}}</span><br>{{episodeTitle}}</p>
-    <p class="episode-title x-episode-title">{{title}}</p>
+    <p>{{StartTime airDateUtc}} {{ShortDate airDateUtc}}</p>
+    <p>
+        <span class="episode-title x-episode-title">
+            {{title}}
+        </span>
+        <span class="pull-right">{{seasonNumber}}x{{Pad2 episodeNumber}}</span>
+    </p>
 </div>
diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less
index 02d309d6a..bad35c14f 100644
--- a/src/UI/Calendar/calendar.less
+++ b/src/UI/Calendar/calendar.less
@@ -105,9 +105,11 @@
 
   .episode-title {
     .btn-link;
+    .text-overflow;
     color      : @linkColor;
     margin-top : 1px;
-    .text-overflow;
+    width      : 150px;
+    display    : inline-block;
   }
 }