diff --git a/src/UI/Settings/MediaManagement/Naming/NamingView.js b/src/UI/Settings/MediaManagement/Naming/NamingView.js
index 2ae43fbef..14229fd41 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingView.js
+++ b/src/UI/Settings/MediaManagement/Naming/NamingView.js
@@ -19,13 +19,15 @@ define(
                 singleEpisodeExample  : '.x-single-episode-example',
                 multiEpisodeExample   : '.x-multi-episode-example',
                 dailyEpisodeExample   : '.x-daily-episode-example',
-                namingTokenHelper     : '.x-naming-token-helper'
+                namingTokenHelper     : '.x-naming-token-helper',
+                multiEpisodeStyle     : '.x-multi-episode-style'
             },
 
             events: {
                 'change .x-rename-episodes'      : '_setFailedDownloadOptionsVisibility',
                 'click .x-show-wizard'           : '_showWizard',
-                'click .x-naming-token-helper a' : '_addToken'
+                'click .x-naming-token-helper a' : '_addToken',
+                'change .x-multi-episode-style'  : '_multiEpisodeFomatChanged'
             },
 
             regions: {
@@ -58,10 +60,6 @@ define(
             },
 
             _updateSamples: function () {
-                if (!_.has(this.model.changed, 'standardEpisodeFormat') && !_.has(this.model.changed, 'dailyEpisodeFormat')) {
-                    return;
-                }
-
                 this.namingSampleModel.fetch({ data: this.model.toJSON() });
             },
 
@@ -92,6 +90,10 @@ define(
 
                 this.ui.namingTokenHelper.removeClass('open');
                 input.focus();
+            },
+
+            multiEpisodeFormatChanged: function () {
+                this.model.set('multiEpisodeStyle', this.ui.multiEpisodeStyle.val());
             }
         });
 
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
index 00908678c..c72a6524e 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html
@@ -88,7 +88,7 @@
             <label class="control-label">Multi-Episode Style</label>
 
             <div class="controls">
-                <select class="inputClass" name="multiEpisodeStyle">
+                <select class="inputClass x-multi-episode-style" name="multiEpisodeStyle">
                     <option value="0">Extend</option>
                     <option value="1">Duplicate</option>
                     <option value="2">Repeat</option>