diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 9969af937d..bbf61a32d3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -6,6 +6,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         //check the pre-values for multi-picker
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
         var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
+        var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
 
         if (!$scope.model.config.startNodeId) {
             userService.getCurrentUser().then(function (userData) {
@@ -68,6 +69,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                startNodeId: $scope.model.config.startNodeId,
                multiPicker: multiPicker,
                onlyImages: onlyImages,
+               disableFolderSelect: disableFolderSelect,
                show: true,
                submit: function(model) {
 
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
index bbb3ee6c17..37587d1c54 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
@@ -23,7 +23,10 @@ namespace Umbraco.Web.PropertyEditors
             public bool MultiPicker { get; set; }
 
             [PreValueField("onlyImages", "Pick only images", "boolean", Description = "Only let the editor choose images from media.")]
-            public bool OnlyImages { get; set; }
+            public bool OnlyImages { get; set; }
+
+            [PreValueField("disableFolderSelect", "Disable folder select", "boolean", Description = "Do not allow folders to be picked.")]
+            public bool DisableFolderSelect { get; set; }
 
             [PreValueField("startNodeId", "Start node", "mediapicker")]
  			public int StartNodeId { get; set; }