diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index c4dfc133a9..fdb990c1fd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -533,8 +533,8 @@
 
         // methods for infinite editing
         $scope.close = function() {
-            if($scope.model.close) {
-                $scope.model.close($scope.model);
+            if($scope.infiniteModel.close) {
+                $scope.infiniteModel.close($scope.infiniteModel);
             }
         };
 
@@ -563,7 +563,7 @@
                 getMethod: "&",
                 getScaffoldMethod: "&?",
                 culture: "=?",
-                model: "=?"
+                infiniteModel: "=?"
             }
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index 750b20986f..96ba2c03de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -57,7 +57,7 @@
                 <umb-editor-footer-content-right>
 
                     <umb-button
-                        ng-if="model.infiniteMode"
+                        ng-if="infiniteModel.infiniteMode"
                         action="close()"
                         button-style="link"
                         label="Close"
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index ec55549c78..d3086a5b34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -8,6 +8,8 @@
  */
 function ContentEditController($scope, $routeParams, contentResource) {
 
+    var infiniteMode = $scope.model && $scope.model.infiniteMode;
+
     function scaffoldEmpty() {
         return contentResource.getScaffold($routeParams.id, $routeParams.doctype);
     }
@@ -15,12 +17,12 @@ function ContentEditController($scope, $routeParams, contentResource) {
         return contentResource.getBlueprintScaffold($routeParams.id, $routeParams.blueprintId);
     }
 
-    $scope.contentId = $routeParams.id;
+    $scope.contentId = infiniteMode ? $scope.model.id : $routeParams.id;
     $scope.saveMethod = contentResource.save;
     $scope.getMethod = contentResource.getById;
     $scope.getScaffoldMethod = $routeParams.blueprintId ? scaffoldBlueprint : scaffoldEmpty;
     $scope.page = $routeParams.page;
-    $scope.isNew = $routeParams.create;
+    $scope.isNew = infiniteMode ? $scope.model.create : $routeParams.create;
     $scope.culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture; //load the default culture selected in the main tree if any
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index 288fb74294..ddd9dd35ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -8,6 +8,6 @@
                     tree-alias="content"
                     is-new="isNew"
                     culture="culture"
-                    model="model">
+                    infinite-model="model">
     </content-editor>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 26c0fb0830..bb61fe392b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -242,6 +242,19 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         $scope.renderModel = [];
     };
 
+    $scope.openContentEditor = function(node) {
+        var contentEditor = {
+            id: node.id,
+            submit: function(model) {
+                editorService.close();
+            },
+            close: function() {
+                editorService.close();
+            }
+        };
+        editorService.contentEditor(contentEditor);
+    };
+
     $scope.openMiniEditor = function(node) {
         miniEditorHelper.launchMiniEditor(node).then(function(updatedNode){
             // update the node
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 4d6135c8b6..0a41119a48 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -15,7 +15,7 @@
                               allow-remove="allowRemoveButton"
                               allow-open="model.config.showOpenButton && allowOpenButton && !dialogEditor"
                               on-remove="remove($index)"
-                              on-open="openMiniEditor(node)">
+                              on-open="openContentEditor(node)">
             </umb-node-preview>
         </div>