diff --git a/src/Umbraco.Core/Manifest/ManifestBuilder.cs b/src/Umbraco.Core/Manifest/ManifestBuilder.cs
index d880c4cc58..d62c215c8d 100644
--- a/src/Umbraco.Core/Manifest/ManifestBuilder.cs
+++ b/src/Umbraco.Core/Manifest/ManifestBuilder.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Core.Manifest
         
         private const string ManifestKey = "manifests";
         private const string PropertyEditorsKey = "propertyeditors";
+        private const string ParameterEditorsKey = "parametereditors";
 
         /// <summary>
         /// Returns all property editors found in the manfifests
@@ -50,7 +51,7 @@ namespace Umbraco.Core.Manifest
             get
             {
                 return (IEnumerable<ParameterEditor>)StaticCache.GetOrAdd(
-                    PropertyEditorsKey,
+                    ParameterEditorsKey,
                     s =>
                     {
                         var editors = new List<ParameterEditor>();
diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
index 8d7c1a988f..2dd302988d 100644
--- a/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
+++ b/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
@@ -32,12 +32,15 @@ namespace Umbraco.Core.PropertyEditors
                 //are filtered.
                 var filtered = Values.Select(x => x as PropertyEditor)
                                      .WhereNotNull()
-                                     .Where(x => x.IsParameterEditor == false)
-                                     .ToArray();
-
-                //now we need to get all manifest property editors in here that are parameter editors!~
-
-                return Values.Except(filtered).Union(ManifestBuilder.ParameterEditors);
+                                     .Where(x => x.IsParameterEditor == false);
+                
+                return Values
+                    //exclude the non parameter editor c# property editors
+                    .Except(filtered)
+                    //include the manifest parameter editors
+                    .Union(ManifestBuilder.ParameterEditors)
+                    //include the manifest prop editors that are parameter editors
+                    .Union(ManifestBuilder.PropertyEditors.Where(x => x.IsParameterEditor));
             }
         }
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs
index 4ae89cc0c5..033e8389e6 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs
@@ -118,5 +118,27 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Macros
 			return files;
 		}
 
+        /// <summary>
+        /// Binds the drop down list but ensures that the macro param type exists if it doesn't the drop down will be left blank
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+	    protected void MacroPropertiesOnItemDataBound(object sender, RepeaterItemEventArgs e)
+	    {
+            if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+            {
+                var propertyTypes = (DropDownList)e.Item.FindControl("macroPropertyType");
+
+                var editors = GetMacroParameterEditors();
+                propertyTypes.DataSource = editors;
+                propertyTypes.DataBind();
+                var macroProp = (IMacroProperty)e.Item.DataItem;
+                if (editors.Any(x => x.Alias == macroProp.EditorAlias))
+                {
+                    propertyTypes.SelectedValue = macroProp.EditorAlias;
+                }    
+            }
+
+	    }
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
index 88d079b4b9..f3fa4ab8bd 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
@@ -9,13 +9,11 @@
     <CD:CssInclude ID="CssInclude1" runat="server" FilePath="Editors/EditMacro.css" PathNameAlias="UmbracoClient" />
 
     <script type="text/javascript">
-        function doSubmit() {
-            document.forms.aspnetForm.submit();
-        }
-
+        
         //handles the change selection of the drop downs to populate the text box
         (function($) {
             $(document).ready(function () {
+
                 //on drop down change, update the text box and clear other text boxes
                 $(".fileChooser select").change(function () {
                     //update the txt box
@@ -39,6 +37,25 @@
                         ValidatorEnable($(this).get(0), true);
                     });
                 });
+                
+                UmbClientMgr.appActions().bindSaveShortCut();
+
+                // U4-667: Make the "Render content in editor" checkbox dependent on the "Use in editor checkbox"
+                var useInEditorCheckBox = $("#<%= macroEditor.ClientID %>");
+                var renderInEditorCheckBox = $("#<%= macroRenderContent.ClientID %>");
+
+                function toggle() {
+                    var disabled = useInEditorCheckBox.is(":checked") == false;
+                    renderInEditorCheckBox.prop("disabled", disabled);
+                }
+
+                toggle();
+
+                useInEditorCheckBox.on("change", function () {
+                    toggle();
+                });
+
+                
             });
         })(jQuery);
         
@@ -119,7 +136,7 @@
     </cc1:Pane>
 
     <cc1:Pane ID="Panel2" runat="server">
-        <asp:Repeater ID="macroProperties" runat="server">
+        <asp:Repeater ID="macroProperties" runat="server" OnItemDataBound="MacroPropertiesOnItemDataBound">
             <HeaderTemplate>
                 <table class="table">
                     <thead>
@@ -151,11 +168,10 @@
                         <asp:TextBox runat="server" ID="macroPropertyName" Text='<%#Eval("Name")%>' />
                     </td>
                     <td>
+                        
                         <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ControlToValidate="macroPropertyType" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
                         <asp:DropDownList OnPreRender="AddChooseList" runat="server" ID="macroPropertyType"
-                            DataTextFormatString="" DataTextField='Name' DataValueField="Alias"
-                            DataSource='<%# GetMacroParameterEditors()%>' 
-                            SelectedValue='<%# Eval("EditorAlias") %>'>
+                            DataTextFormatString="" DataTextField='Name' DataValueField="Alias">
                         </asp:DropDownList>
                     </td>
                     <td>
@@ -191,28 +207,4 @@
         </asp:Repeater>
     </cc1:Pane>
 
-    <asp:PlaceHolder runat="server">
-        <script type="text/javascript">
-            jQuery(document).ready(function () {
-                UmbClientMgr.appActions().bindSaveShortCut();
-
-                (function ($) {
-                    // U4-667: Make the "Render content in editor" checkbox dependent on the "Use in editor checkbox"
-                    var useInEditorCheckBox = $("#<%= macroEditor.ClientID %>");
-                    var renderInEditorCheckBox = $("#<%= macroRenderContent.ClientID %>");
-
-                    toggle();
-
-                    useInEditorCheckBox.on("change", function() {
-                        toggle();
-                    });
-                    
-                    function toggle() {
-                        var disabled = useInEditorCheckBox.is(":checked") == false;
-                        renderInEditorCheckBox.prop("disabled", disabled);
-                    }
-                })(jQuery);
-            });
-        </script>
-    </asp:PlaceHolder>
 </asp:Content>