diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index b48286f197..b96c651f1c 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -96,6 +96,11 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string MediaPicker = "Umbraco.MediaPicker";
 
+                /// <summary>
+                /// Multiple Media Picker.
+                /// </summary>
+                public const string MultipleMediaPicker = "Umbraco.MultipleMediaPicker";
+
                 /// <summary>
                 /// Member Picker.
                 /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
new file mode 100644
index 0000000000..1208a5eecc
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    /// <summary>
+    /// Represents a multiple media picker macro parameter editor.
+    /// </summary>
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultipleMediaPicker,
+        EditorType.MacroParameter,
+        "Multiple Media Picker",
+        "mediapicker",
+        ValueType = ValueTypes.Text)]
+    public class MultipleMediaPickerParameterEditor : DataEditor
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipleMediaPickerParameterEditor"/> class.
+        /// </summary>
+        public MultipleMediaPickerParameterEditor(ILogger logger)
+            : base(logger)
+        {
+            DefaultConfiguration.Add("multiPicker", "1");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2365017504..1769218f05 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />