diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
index d5571ba78c..6520a2ecf8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function EditController($location, $routeParams, packageResource, contentTypeResource, templateResource, stylesheetResource, languageResource, dictionaryResource, dataTypeResource, editorService) {
+    function EditController($location, $routeParams, entityResource, packageResource, contentTypeResource, templateResource, stylesheetResource, languageResource, dictionaryResource, dataTypeResource, editorService) {
 
         const vm = this;
 
@@ -40,6 +40,15 @@
                 // load package
                 packageResource.getCreatedById(packageId).then(createdPackage => {
                     vm.package = createdPackage;
+
+                    // get render model for content node
+                    if(vm.package.contentNodeId) {
+                        entityResource.getById(vm.package.contentNodeId, "Document")
+                            .then((entity) => {
+                                vm.contentNodeDisplayModel = entity;
+                            });
+                    }
+
                 }, angular.noop);
             }
 
@@ -99,14 +108,15 @@
         }
 
         function removeContentItem() {
-            vm.package.contentItem = null;
+            vm.package.contentNodeId = null;
         }
 
         function openContentPicker() {
             const contentPicker = {
                 submit: function(model) {
                     if(model.selection && model.selection.length > 0) {
-                        vm.package.contentItem = model.selection[0];
+                        vm.package.contentNodeId = model.selection[0].id.toString();
+                        vm.contentNodeDisplayModel = model.selection[0];
                     }
                     editorService.close();
                 },
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 796edff588..77743a1116 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -81,12 +81,10 @@
 
                         <umb-control-group label="Content">
 
-                            <!-- TODO: This can be a single node AND child nodes selected -->
-                            <!-- TODO: This can be various specific nodes selected -->
                             <umb-node-preview
                                 ng-if="vm.package.contentNodeId"
-                                icon="vm.package.contentItem.icon"
-                                name="vm.package.contentItem.name"
+                                icon="vm.contentNodeDisplayModel.icon"
+                                name="vm.contentNodeDisplayModel.name"
                                 allow-edit="true"
                                 allow-remove="true"
                                 on-edit="vm.openContentPicker()"