diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 919230bb0c..74b3e613b6 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -22,8 +22,7 @@
                         <paper-checkbox class="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</paper-checkbox>
                         <paper-checkbox class="chkOtherTrailers">${OptionOtherTrailers}</paper-checkbox>
                     </div>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</div>
-                    <div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
+                    <div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</a></div>
                 </div>
                 <br />
                 <div>
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 3d2c0a305a..d393dc9f6c 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -101,6 +101,14 @@
 
         $('.cinemaModeConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        if (!AppInfo.enableSupporterMembership) {
+            page.querySelector('.lnkSupporterLearnMore').href = '#';
+            page.querySelector('.lnkSupporterLearnMore').addEventListener('click', function (e) {
+                e.preventDefault();
+                return false;
+            });
+        }
+
     }).on('pageshow', "#cinemaModeConfigurationPage", function () {
 
         Dashboard.showLoadingMsg();
@@ -112,12 +120,6 @@
             loadPage(page, config);
 
         });
-
-        if (AppInfo.enableSupporterMembership) {
-            $('.lnkSupporterLearnMore', page).show();
-        } else {
-            $('.lnkSupporterLearnMore', page).hide();
-        }
     });
 
 });
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index ee1507fdf0..beb9c0c461 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1578,9 +1578,9 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use
 
         window.addEventListener("beforeunload", onAppClose);
 
-        if (browserInfo.safari) {
-            document.addEventListener("pause", onAppClose);
-        }
+        //if (browserInfo.safari) {
+        //    document.addEventListener("pause", onAppClose);
+        //}
 
         function sendProgressUpdate() {