diff --git a/NzbDrone.ncrunchsolution b/NzbDrone.ncrunchsolution
index 969da6dd4..c725a019c 100644
--- a/NzbDrone.ncrunchsolution
+++ b/NzbDrone.ncrunchsolution
@@ -2,7 +2,6 @@
1
True
true
- true
UseDynamicAnalysis
Disabled
Disabled
diff --git a/UI/Episode/LayoutTemplate.html b/UI/Episode/LayoutTemplate.html
index f46581cdd..dcebc8662 100644
--- a/UI/Episode/LayoutTemplate.html
+++ b/UI/Episode/LayoutTemplate.html
@@ -3,9 +3,9 @@
{{#if episodeTitle}}
-
{{episodeTitle}} - {{seasonNumber}}x{{paddedEpisodeNumber}}
+ {{episodeTitle}} - {{episodeNumberHelper}}
{{else}}
- {{title}} - {{seasonNumber}}x{{paddedEpisodeNumber}}
+ {{title}} - {{episodeNumberHelper}}
{{/if}}
diff --git a/UI/Handlebars/Helpers/EpisodeNumber.js b/UI/Handlebars/Helpers/EpisodeNumber.js
new file mode 100644
index 000000000..97b0469de
--- /dev/null
+++ b/UI/Handlebars/Helpers/EpisodeNumber.js
@@ -0,0 +1,18 @@
+'use strict';
+define(
+ [
+ 'handlebars',
+ 'Shared/FormatHelpers'
+ ], function (Handlebars, FormatHelpers) {
+ Handlebars.registerHelper('episodeNumberHelper', function () {
+
+ if (this.series.seriesType === 'daily') {
+ return FormatHelpers.DateHelper(this.airDate);
+ }
+
+ else {
+ return '{0}x{1}'.format(this.seasonNumber, this.paddedEpisodeNumber);
+ }
+
+ });
+ });
diff --git a/UI/Handlebars/backbone.marionette.templates.js b/UI/Handlebars/backbone.marionette.templates.js
index a566b1336..697d51d9a 100644
--- a/UI/Handlebars/backbone.marionette.templates.js
+++ b/UI/Handlebars/backbone.marionette.templates.js
@@ -6,6 +6,7 @@ define(
'Handlebars/Helpers/DateTime',
'Handlebars/Helpers/Html',
'Handlebars/Helpers/Numbers',
+ 'Handlebars/Helpers/EpisodeNumber',
'Handlebars/Debug'
], function (Templates) {
return function () {