diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 48abaa1997..adb7ad3dcc 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -334,7 +334,6 @@
                                 <div data-role="fieldcontain" id="fldDisplayOrder" class="fldDisplaySetting">
                                     <label for="selectDisplayOrder" id="labelDisplayOrder">Display order:</label>
                                     <select id="selectDisplayOrder" data-mini="true">
-                                        
                                     </select>
                                 </div>
                             </div>
@@ -375,6 +374,18 @@
                                 <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listTags"></ul>
                             </div>
                         </div>
+                        <div data-mini="true" data-role="collapsible" id="keywordsCollapsible" style="display: none;">
+                            <h3>Keywords</h3>
+                            <div data-role="editableListviewContainer">
+                                <div data-role="fieldcontain">
+                                    <div style="display: inline-block; width: 80%;">
+                                        <input type="text" data-mini="true" />
+                                    </div>
+                                    <a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">Add</a>
+                                </div>
+                                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listKeywords"></ul>
+                            </div>
+                        </div>
                         <div data-role="collapsible" data-mini="true" id="metadataSettingsCollapsible" style="display: none;">
                             <h3>Metadata Settings</h3>
                             <div>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 932048a7c2..f093e315a1 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -716,6 +716,12 @@
             $('.fldRefresh', page).show();
         }
 
+        if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "BoxSet") {
+            $('#keywordsCollapsible', page).show();
+        } else {
+            $('#keywordsCollapsible', page).hide();
+        }
+
         if (item.MediaType == "Video" && item.Type != "Channel") {
             $('#fldSourceType', page).hide();
         } else {
@@ -831,6 +837,8 @@
         populateListView($('#listStudios', page), (item.Studios || []).map(function (element) { return element.Name || ''; }));
 
         populateListView($('#listTags', page), item.Tags);
+        populateListView($('#listKeywords', page), item.Keywords);
+
         var enableInternetProviders = (item.EnableInternetProviders || false);
         $("#enableInternetProviders", page).attr('checked', enableInternetProviders).checkboxradio('refresh');
         if (enableInternetProviders) {
@@ -1091,6 +1099,7 @@
 
         metadatafields.push({ name: "Studios" });
         metadatafields.push({ name: "Tags" });
+        metadatafields.push({ name: "Keywords" });
         metadatafields.push({ name: "Images" });
         metadatafields.push({ name: "Backdrops" });
 
@@ -1150,6 +1159,7 @@
                 AirTime: convertTo12HourFormat($('#txtAirTime', form).val()),
                 Genres: editableListViewValues($("#listGenres", form)),
                 Tags: editableListViewValues($("#listTags", form)),
+                Keywords: editableListViewValues($("#listKeywords", form)),
                 Studios: editableListViewValues($("#listStudios", form)).map(function (element) { return { Name: element }; }),
 
                 PremiereDate: $('#txtPremiereDate', form).val() || null,