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 245b0e055b..d26d7ffccd 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
@@ -5,14 +5,13 @@ 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;
 
         if (!$scope.model.config.startNodeId) {
             userService.getCurrentUser().then(function (userData) {
                 $scope.model.config.startNodeId = userData.startMediaId;
             });
         }
-            
-
          
         function setupViewModel() {
             $scope.images = [];
@@ -62,6 +61,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             dialogService.mediaPicker({
                 startNodeId: $scope.model.config.startNodeId,
                 multiPicker: multiPicker,
+                onlyImages: onlyImages,
                 callback: function(data) {
                     
                     //it's only a single selector, so make it into an array
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
index 947c9f0062..cfd11ac60a 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -16,7 +16,8 @@ namespace Umbraco.Web.PropertyEditors
         {
             InternalPreValues = new Dictionary<string, object>
                 {
-                    {"multiPicker", "0"}
+                    {"multiPicker", "0"},
+                    {"onlyImages", "0"}
                 };
         }
 
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
index 1ce77804fa..3dc203ab49 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
@@ -22,6 +22,9 @@ namespace Umbraco.Web.PropertyEditors
             [PreValueField("multiPicker", "Pick multiple items", "boolean")]
             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; }
+
             [PreValueField("startNodeId", "Start node", "mediapicker")]
  			public int StartNodeId { get; set; }
         }