diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
index 0d1ef0070c..6d474087b6 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
@@ -73,7 +73,7 @@
                         <%# DataBinder.Eval(Container, "DataItem.Name") %>
                         <asp:HiddenField ID="Alias" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.Alias")%>' />
                         <asp:HiddenField ID="Name" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.Name")%>' />
-                        <asp:HiddenField ID="DataTypeId" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.DataTypeId")%>' />
+                        <asp:HiddenField ID="PropertyEditorAlias" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.PropertyEditorAlias")%>' />
                     </td>
                     <td><asp:DropDownList id="DestinationProperty" runat="server" /></td>
                 </tr>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
index 0c571bb407..c9456316d8 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
@@ -141,13 +141,11 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
                 if (ri.ItemType == ListItemType.Item || ri.ItemType == ListItemType.AlternatingItem)
                 {
                     // Get data type from hidden field
-                    var dataTypeId = Guid.Parse(((HiddenField)ri.FindControl("DataTypeId")).Value);
-
-                    //TODO: Change this logic as it will not be backwards compatible with Belle if there's no GUID -> Alias mapping!
+                    var propEdAlias = ((HiddenField)ri.FindControl("PropertyEditorAlias")).Value;
 
                     // Bind destination list with properties that match data type
                     var ddl = (DropDownList)ri.FindControl("DestinationProperty");
-                    ddl.DataSource = properties.Where(x => x.DataTypeId == dataTypeId);
+                    ddl.DataSource = properties.Where(x => x.PropertyEditorAlias == propEdAlias);
                     ddl.DataValueField = "Alias";
                     ddl.DataTextField = "Name";
                     ddl.DataBind();