diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 32bfced26a..55cce057e3 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -717,7 +717,7 @@
                 Revenue: $('#txtRevenue', form).val(),
                 CriticRating: $('#txtCriticRating', form).val(),
                 CriticRatingSummary: $('#txtCriticRatingSummary', form).val(),
-                IndexNumber: $('#txtIndexNumber', form).val(),
+                IndexNumber: $('#txtIndexNumber', form).val() || null,
                 DisplaySpecialsWithSeasons: $('#chkDisplaySpecialsInline', form).checked(),
                 AbsoluteEpisodeNumber: $('#txtAbsoluteEpisodeNumber', form).val(),
                 DvdEpisodeNumber: $('#txtDvdEpisodeNumber', form).val(),
@@ -725,7 +725,7 @@
                 AirsBeforeSeasonNumber: $('#txtAirsBeforeSeason', form).val(),
                 AirsAfterSeasonNumber: $('#txtAirsAfterSeason', form).val(),
                 AirsBeforeEpisodeNumber: $('#txtAirsBeforeEpisode', form).val(),
-                ParentIndexNumber: $('#txtParentIndexNumber', form).val(),
+                ParentIndexNumber: $('#txtParentIndexNumber', form).val() || null,
                 DisplayOrder: $('#selectDisplayOrder', form).val(),
                 Players: $('#txtPlayers', form).val(),
                 Album: $('#txtAlbum', form).val(),
@@ -813,6 +813,10 @@
 
                 Dashboard.alert('Item saved.');
 
+                MetadataEditor.getItemPromise().done(function (i) {
+                    $(form).parents('.page').trigger('itemsaved', [i]);
+                });
+
             });
 
             return false;
@@ -957,7 +961,7 @@
             Dashboard.alert('Please enter a name or an external Id.');
             return;
         }
-        
+
         if (currentItem.GameSystem) {
             lookupInfo.GameSystem = currentItem.GameSystem;
         }
@@ -1029,7 +1033,7 @@
             html += '<div class="remoteImageDetails">';
             html += result.ProductionYear || '&nbsp;';
             html += '</div>';
-            
+
             if (result.GameSystem) {
                 html += '<div class="remoteImageDetails">';
                 html += result.GameSystem;
@@ -1044,7 +1048,7 @@
         $('.searchImage', elem).on('click', function () {
 
             Dashboard.showLoadingMsg();
-            
+
             var index = parseInt(this.getAttribute('data-index'));
 
             var currentResult = results[index];
diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js
index 050784eeeb..b3dbdd9810 100644
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@@ -4,6 +4,15 @@
 
         var state = item.IsFolder ? folderState : '';
 
+        var htmlName = getNodeInnerHtml(item);
+
+        var rel = item.IsFolder ? 'folder' : 'default';
+
+        return { attr: { id: item.Id, rel: rel, itemtype: item.Type }, data: htmlName, state: state };
+    }
+    
+    function getNodeInnerHtml(item) {
+        
         var name = item.Name;
 
         // Channel number
@@ -62,9 +71,7 @@
 
         htmlName += "</div>";
 
-        var rel = item.IsFolder ? 'folder' : 'default';
-
-        return { attr: { id: item.Id, rel: rel, itemtype: item.Type }, data: htmlName, state: state };
+        return htmlName;
     }
 
     function loadChildrenOfRootNode(page, callback, openItems, selectedId) {
@@ -95,9 +102,7 @@
 
                 var name = service.Name;
 
-                var cssClass = "editorNode";
-
-                var htmlName = "<div class='" + cssClass + "'>";
+                var htmlName = "<div class='editorNode'>";
 
                 htmlName += name;
 
@@ -246,8 +251,32 @@
 
         });
     }
+    
+    function updateEditorNode(page, item) {
 
-    $(document).on('pagebeforeshow', ".metadataEditorPage", function () {
+        var elem = $('#' + item.Id + '>a', page)[0];
+
+        if (elem == null) {
+            return;
+        }
+
+        $('.editorNode', elem).remove();
+
+        $(elem).append(getNodeInnerHtml(item));
+        
+        if (item.IsFolder) {
+
+            var tree = jQuery.jstree._reference(".libraryTree");
+            var currentNode = tree._get_node(null, false);
+            tree.refresh(currentNode);
+        }
+    }
+
+    $(document).on('itemsaved', ".metadataEditorPage", function (e, item) {
+
+        updateEditorNode(this, item);
+
+    }).on('pagebeforeshow', ".metadataEditorPage", function () {
 
         window.MetadataEditor = new metadataEditor();