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 3fd57a33b8..ab1aeb06e2 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
@@ -26,7 +26,8 @@ angular.module('umbraco')
 
 		if($scope.cfg.startNode.type === "member"){
 		    $scope.cfg.entityType = "Member";		    
-		}else if ($scope.cfg.type === "media") {
+		}
+		else if ($scope.cfg.startNode.type === "media") {
 			$scope.cfg.entityType = "Media";
 		}