diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 6337db7dd..f2e08fb67 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -152,6 +152,7 @@ namespace NzbDrone.Web.Controllers
                                 XbmcHosts = _configProvider.XbmcHosts,
                                 XbmcUsername = _configProvider.XbmcUsername,
                                 XbmcPassword = _configProvider.XbmcPassword,
+                                XbmcUpdateWhenPlaying = _configProvider.XbmcUpdateWhenPlaying,
                                 SmtpEnabled = _externalNotificationProvider.GetSettings(typeof(Smtp)).Enable,
                                 SmtpNotifyOnGrab = _configProvider.SmtpNotifyOnGrab,
                                 SmtpNotifyOnDownload = _configProvider.SmtpNotifyOnGrab,
@@ -502,6 +503,7 @@ namespace NzbDrone.Web.Controllers
                 _configProvider.XbmcHosts = data.XbmcHosts;
                 _configProvider.XbmcUsername = data.XbmcUsername;
                 _configProvider.XbmcPassword = data.XbmcPassword;
+                _configProvider.XbmcUpdateWhenPlaying = data.XbmcUpdateWhenPlaying;
 
                 //SMTP
                 var smtpSettings = _externalNotificationProvider.GetSettings(typeof(Smtp));
diff --git a/NzbDrone.Web/Models/NotificationSettingsModel.cs b/NzbDrone.Web/Models/NotificationSettingsModel.cs
index e85c3246a..6332e744a 100644
--- a/NzbDrone.Web/Models/NotificationSettingsModel.cs
+++ b/NzbDrone.Web/Models/NotificationSettingsModel.cs
@@ -48,6 +48,10 @@ namespace NzbDrone.Web.Models
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public string XbmcPassword { get; set; }
 
+        [DisplayName("Always Update")]
+        [Description("Update Library even when a video is playing?")]
+        public bool XbmcUpdateWhenPlaying { get; set; }
+
         //SMTP
         [DisplayName("Enabled")]
         [Description("Enable Email notifications?")]
diff --git a/NzbDrone.Web/Views/Settings/Xbmc.cshtml b/NzbDrone.Web/Views/Settings/Xbmc.cshtml
index 2df3ad734..2cebdb847 100644
--- a/NzbDrone.Web/Views/Settings/Xbmc.cshtml
+++ b/NzbDrone.Web/Views/Settings/Xbmc.cshtml
@@ -30,6 +30,11 @@
         <span class="small">@Html.DescriptionFor(m => m.XbmcCleanLibrary)</span>
     </label>
     @Html.CheckBoxFor(m => m.XbmcCleanLibrary, new { @class = "inputClass checkClass" })
+
+    <label class="labelClass">@Html.LabelFor(m => m.XbmcUpdateWhenPlaying)
+        <span class="small">@Html.DescriptionFor(m => m.XbmcUpdateWhenPlaying)</span>
+    </label>
+    @Html.CheckBoxFor(m => m.XbmcUpdateWhenPlaying, new { @class = "inputClass checkClass" })
             
     <label class="labelClass">@Html.LabelFor(m => m.XbmcHosts)
         <span class="small">@Html.DescriptionFor(m => m.XbmcHosts)</span>