diff --git a/R7.Documents.Dnn/Controls/UrlControlWrapper.ascx b/R7.Documents.Dnn/Controls/UrlControlWrapper.ascx
new file mode 100644
index 0000000..f54dda4
--- /dev/null
+++ b/R7.Documents.Dnn/Controls/UrlControlWrapper.ascx
@@ -0,0 +1,7 @@
+<%@ Control Language="C#" CodeBehind="UrlControlWrapper.ascx.cs" Inherits="R7.Documents.Controls.UrlControlWrapper" %>
+<%@ Register TagPrefix="dnn" TagName="Url" Src="~/controls/DnnUrlControl.ascx" %>
+<dnn:Url id="ctlUrl" runat="server"
+         UrlType="F"
+         ShowTabs="true" IncludeActiveTab="true"
+    	 ShowNone="True"  ShowNewWindow="True"
+    	 ShowSecure="True" ShowDatabase="True" />
diff --git a/R7.Documents.Dnn/EditDocuments.ascx b/R7.Documents.Dnn/EditDocuments.ascx
index c13d19e..4d78cd2 100644
--- a/R7.Documents.Dnn/EditDocuments.ascx
+++ b/R7.Documents.Dnn/EditDocuments.ascx
@@ -1,8 +1,8 @@
 <%@ Control Language="C#" AutoEventWireup="false" CodeBehind="EditDocuments.ascx.cs" Inherits="R7.Documents.EditDocuments" %>
-<%@ Register TagPrefix="dnn" TagName="URL" Src="~/controls/DnnUrlControl.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Audit" Src="~/controls/ModuleAuditControl.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Tracking" Src="~/controls/URLTrackingControl.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
+<%@ Register TagPrefix="r7docs" TagName="Url" Src="~/DesktopModules/R7.Documents/R7.Documents.Dnn/Controls/UrlControlWrapper.ascx" %>
 <%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls" Assembly="DotNetNuke.Web.Deprecated" %>
 <%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %>
 
@@ -26,13 +26,8 @@
         	    </div>
         		<div class="dnnFormItem">
         	        <dnn:Label id="lblUrl" runat="server" ControlName="ctlUrl" />
-        	       	<div class="dnnLeft">
-        	            <dnn:Url id="ctlUrl" runat="server" UrlType="F"
-    						ShowTabs="true" IncludeActiveTab="true"
-    						ShowNone="True"  ShowNewWindow="True"
-    						ShowSecure="True" ShowDatabase="True" />
-        	        </div>
-				</div>
+        	       	<r7docs:Url id="ctlUrl" runat="server" />
+        	    </div>
 				<div class="dnnFormItem">
                     <dnn:Label id="lblSortIndex" runat="server" ControlName="txtSortIndex" />
                     <asp:TextBox id="txtSortIndex" runat="server">10</asp:TextBox>
diff --git a/R7.Documents.Dnn/EditDocuments.ascx.controls.cs b/R7.Documents.Dnn/EditDocuments.ascx.controls.cs
index 8fb46cf..3c33c1d 100644
--- a/R7.Documents.Dnn/EditDocuments.ascx.controls.cs
+++ b/R7.Documents.Dnn/EditDocuments.ascx.controls.cs
@@ -1,6 +1,7 @@
 using System.Web.UI.WebControls;
 using DotNetNuke.UI.UserControls;
 using DotNetNuke.Web.UI.WebControls;
+using R7.Documents.Controls;
 
 namespace R7.Documents
 {
@@ -8,7 +9,7 @@ public partial class EditDocuments
 	{
 		protected TextBox txtTitle;
 		protected RequiredFieldValidator valName;
-		protected DnnUrlControl ctlUrl;
+		protected UrlControlWrapper ctlUrl;
 		protected TextBox txtCategory;
 		protected TextBox txtDescription;
 		protected CheckBox chkForceDownload;
diff --git a/R7.Documents.Dnn/EditDocuments.ascx.cs b/R7.Documents.Dnn/EditDocuments.ascx.cs
index fb9a67d..78e4c24 100644
--- a/R7.Documents.Dnn/EditDocuments.ascx.cs
+++ b/R7.Documents.Dnn/EditDocuments.ascx.cs
@@ -251,7 +251,7 @@ void LoadNewDocument ()
             txtSortIndex.Text = ((CalculateSortIndex () ?? 0) + 10).ToString ();
 
             if (IsFirstLoad) {
-                SelectFolder (ctlUrl, Settings.DefaultFolder ?? FolderHistory.GetLastFolderId (Request, PortalId));
+                SelectFolder (ctlUrl.BaseUrlControl, Settings.DefaultFolder ?? FolderHistory.GetLastFolderId (Request, PortalId));
             }
 
             ctlUrl.NewWindow = DocumentsConfig.Instance.NewWindow;
diff --git a/R7.Documents.Dnn/R7.Documents.Dnn.csproj b/R7.Documents.Dnn/R7.Documents.Dnn.csproj
index e476d63..45fb476 100644
--- a/R7.Documents.Dnn/R7.Documents.Dnn.csproj
+++ b/R7.Documents.Dnn/R7.Documents.Dnn.csproj
@@ -113,6 +113,7 @@
     <Folder Include="images\" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Controls\UrlControlWrapper.ascx" />
     <Content Include="module.css" />
     <Content Include="SqlDataProvider\01.12.00.dnn.sql" />
     <Content Include="ViewDocuments.ascx" />
@@ -153,6 +154,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Components\DocumentsController.cs" />
+    <Compile Include="Controls\UrlControlWrapper.ascx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UrlControlWrapper.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ViewDocuments.ascx.cs">
       <DependentUpon>ViewDocuments.ascx</DependentUpon>
     </Compile>