diff --git a/src/Umbraco.Core/ControlExtensions.cs b/src/Umbraco.Core/ControlExtensions.cs
new file mode 100644
index 0000000000..391c69159f
--- /dev/null
+++ b/src/Umbraco.Core/ControlExtensions.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace Umbraco.Core
+{
+    internal static class ControlExtensions
+    {
+        /// <summary>
+        /// Recursively finds a control with the specified identifier.
+        /// </summary>
+        /// <typeparam name="T">
+        /// The type of control to be found.
+        /// </typeparam>
+        /// <param name="parent">
+        /// The parent control from which the search will start.
+        /// </param>
+        /// <param name="id">
+        /// The identifier of the control to be found.
+        /// </param>
+        /// <returns>
+        /// The control with the specified identifier, otherwise <see langword="null"/> if the control 
+        /// is not found.
+        /// </returns>
+        public static T FindControlRecursive<T>(this Control parent, string id) where T : Control
+        {
+            if ((parent is T) && (parent.ID == id))
+            {
+                return (T)parent;
+            }
+
+            foreach (Control control in parent.Controls)
+            {
+                var foundControl = FindControlRecursive<T>(control, id);
+                if (foundControl != null)
+                {
+                    return foundControl;
+                }
+            }
+            return default(T);
+        }
+
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index aa55c55f5a..98a2aab8b9 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Configuration\UmbracoConfigurationSection.cs" />
     <Compile Include="Configuration\UmbracoVersion.cs" />
     <Compile Include="Attempt.cs" />
+    <Compile Include="ControlExtensions.cs" />
     <Compile Include="CoreBootManager.cs" />
     <Compile Include="DatabaseContext.cs" />
     <Compile Include="DataTableExtensions.cs" />
diff --git a/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs b/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
index ac3f9409fb..82a0385c32 100644
--- a/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-
+using Umbraco.Core;
 using umbraco.interfaces;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
@@ -175,7 +175,7 @@ namespace umbraco.cms.businesslogic.datatype
             foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
             {
                 var result = k.Value.Validate();
-                Label lbl = FindControlRecursive<Label>(this, "lbl" + k.Key);
+                Label lbl = this.FindControlRecursive<Label>("lbl" + k.Key);
                 if (result == null && lbl != null)
                 {
                     if (lbl != null)
@@ -327,24 +327,6 @@ namespace umbraco.cms.businesslogic.datatype
             }
             
         }
-
-        private static T FindControlRecursive<T>(Control parent, string id) where T : Control
-        {
-            if ((parent is T) && (parent.ID == id))
-            {
-                return (T)parent;
-            }
-
-            foreach (Control control in parent.Controls)
-            {
-                T foundControl = FindControlRecursive<T>(control, id);
-                if (foundControl != null)
-                {
-                    return foundControl;
-                }
-            }
-            return default(T);
-        }
     }
 
 
diff --git a/src/umbraco.editorControls/uploadfield/uploadField.cs b/src/umbraco.editorControls/uploadfield/uploadField.cs
index 8aea59e7f3..ec1a1b6e97 100644
--- a/src/umbraco.editorControls/uploadfield/uploadField.cs
+++ b/src/umbraco.editorControls/uploadfield/uploadField.cs
@@ -132,7 +132,7 @@ namespace umbraco.editorControls
                 {
                     try
                     {
-                        var bytesControl = FindControlRecursive<noEdit>(Page, "prop_" + prop);
+                        var bytesControl = Page.FindControlRecursive<noEdit>("prop_" + prop);
                         if (bytesControl != null)
                         {
                             bytesControl.RefreshLabel(string.Empty);
@@ -184,7 +184,7 @@ namespace umbraco.editorControls
 
         private static void UpdateLabelValue(string propAlias, string controlId, Page controlPage, Content content)
         {
-            var extensionControl = FindControlRecursive<noEdit>(controlPage, controlId);
+            var extensionControl = controlPage.FindControlRecursive<noEdit>(controlId);
             if (extensionControl != null)
             {
                 if (content.getProperty(propAlias) != null && content.getProperty(propAlias).Value != null)
@@ -261,41 +261,7 @@ namespace umbraco.editorControls
                 }
             }
         }
-
-        /// <summary>
-        /// Recursively finds a control with the specified identifier.
-        /// </summary>
-        /// <typeparam name="T">
-        /// The type of control to be found.
-        /// </typeparam>
-        /// <param name="parent">
-        /// The parent control from which the search will start.
-        /// </param>
-        /// <param name="id">
-        /// The identifier of the control to be found.
-        /// </param>
-        /// <returns>
-        /// The control with the specified identifier, otherwise <see langword="null"/> if the control 
-        /// is not found.
-        /// </returns>
-        private static T FindControlRecursive<T>(Control parent, string id) where T : Control
-        {
-            if ((parent is T) && (parent.ID == id))
-            {
-                return (T) parent;
-            }
-
-            foreach (Control control in parent.Controls)
-            {
-                var foundControl = FindControlRecursive<T>(control, id);
-                if (foundControl != null)
-                {
-                    return foundControl;
-                }
-            }
-            return default(T);
-        }
-
+        
         /// <summary> 
         /// Render this control to the output parameter specified.
         /// </summary>
diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
index 096b708804..72c259a4ff 100644
--- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
+++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
@@ -8,7 +8,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using System.IO;
-
+using Umbraco.Core;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 
@@ -220,7 +220,7 @@ namespace umbraco.editorControls.userControlGrapper
 			foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
 			{
 				var result = k.Value.Validate();
-				 Label lbl = FindControlRecursive<Label>(_phSettings, "lbl" + k.Key);
+                Label lbl = _phSettings.FindControlRecursive<Label>("lbl" + k.Key);
 				if(result == null && lbl != null)
 				{
 					if(lbl != null)
@@ -320,25 +320,6 @@ namespace umbraco.editorControls.userControlGrapper
 			}
 		}
 
-		private static T FindControlRecursive<T>(Control parent, string id) where T : Control
-		{
-			if ((parent is T) && (parent.ID == id))
-			{
-				return (T)parent;
-			}
-
-			foreach (Control control in parent.Controls)
-			{
-				T foundControl = FindControlRecursive<T>(control, id);
-				if (foundControl != null)
-				{
-					return foundControl;
-				}
-			}
-			return default(T);
-		}
-
-
 		#endregion
 	}
 }