diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 405ab4f9d..988be10f1 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -29,12 +29,6 @@
                     </div>
                     <br />
                     <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</label>
-                            <input type="checkbox" id="chkMyMovieTrailers" data-mini="true" />
-                            <div class="fieldDescription">${OptionTrailersFromMyMoviesHelp}</div>
-                            <div class="fieldDescription"><a href="http://mediabrowser.tv/community/index.php?/topic/674-media-files-folders-structure/" target="_blank">${ButtonLearnMore}</a></div>
-                        </li>
                         <li>
                             <fieldset data-role="controlgroup">
                                 <legend>${LabelSelectInternetTrailersForCinemaMode}</legend>
@@ -48,6 +42,20 @@
                             <div class="fieldDescription">${LabelTheseFeaturesRequireSupporterHelpAndTrailers}</div>
                             <div class="fieldDescription"><a href="supporter.html">${ButtonLearnMore}</a></div>
                         </li>
+                        <li>
+                            <label for="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</label>
+                            <input type="checkbox" id="chkMyMovieTrailers" data-mini="true" />
+                            <div class="fieldDescription">${OptionTrailersFromMyMoviesHelp}</div>
+                            <div class="fieldDescription"><a href="http://mediabrowser.tv/community/index.php?/topic/674-media-files-folders-structure/" target="_blank">${ButtonLearnMore}</a></div>
+                        </li>
+                        <li>
+                            <label for="txtCustomIntrosPath">${LabelCustomIntrosPath}</label>
+                            <div style="display: inline-block; width: 92%;">
+                                <input type="text" id="txtCustomIntrosPath" />
+                            </div>
+                            <button id="btnSelectCustomIntrosPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
+                            <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
+                        </li>
                         <li>
                             <label for="txtNumTrailers">${LabelNumberTrailerToPlay}</label>
                             <input type="number" id="txtNumTrailers" data-mini="true" min="1" max="10" step="1" />
@@ -61,14 +69,6 @@
                             <label for="chkUnwatchedOnly">${LabelLimitIntrosToUnwatchedContent}</label>
                             <input type="checkbox" id="chkUnwatchedOnly" data-mini="true" />
                         </li>
-                        <li>
-                            <label for="txtCustomIntrosPath">${LabelCustomIntrosPath}</label>
-                            <div style="display: inline-block; width: 92%;">
-                                <input type="text" id="txtCustomIntrosPath" />
-                            </div>
-                            <button id="btnSelectCustomIntrosPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
-                            <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
-                        </li>
                     </ul>
                     <p>${CinemaModeConfigurationHelp2}</p>
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 6758b736c..5d215afe1 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -17,7 +17,9 @@
         Dashboard.showLoadingMsg();
 
         var promise1 = MetadataEditor.getItemPromise();
-        var promise2 = ApiClient.getJSON(ApiClient.getUrl('Items/' + MetadataEditor.currentItemId + '/MetadataEditor'));
+        var promise2 = MetadataEditor.currentItemId ?
+            ApiClient.getJSON(ApiClient.getUrl('Items/' + MetadataEditor.currentItemId + '/MetadataEditor')) :
+            {};
 
         $.when(promise1, promise2).done(function (response1, response2) {