diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
index 87027c0318..f12ab67b7b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
+<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.developer.assemblyBrowser" %>
 <%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
@@ -7,7 +7,8 @@
 
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-<h3 style="MARGIN-LEFT: 0px"><asp:Label id="AssemblyName" runat="server"></asp:Label></h3>
+<h4><asp:Label id="AssemblyName" runat="server"></asp:Label></h4>
+
 <asp:Panel id="ChooseProperties" runat="server">
 					<p class="guiDialogTiny">The following list shows the Public Properties from the 
 						Control. By checking the Properties and click the "Save Properties" button at 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
index b58dbc3836..435a75fa09 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
@@ -44,7 +44,11 @@ namespace umbraco.developer
                 if (Request.QueryString["type"] == null)
                 {
                     isUserControl = true;
-                    var fileName = Request.CleanForXss("fileName");
+                    var fileName = Request.QueryString["fileName"];
+                    //yes this is crap but the ClearnForXss cleans / - so this is a shortcut
+
+                    fileName = fileName.Replace('/', '@').CleanForXss().Replace('@', '/');
+
                     if (!fileName.StartsWith("~"))
                     {
                         if (fileName.StartsWith("/"))
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
index 812f64117a..fe16914cfa 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,15 +12,6 @@ namespace umbraco.developer {
     
     public partial class assemblyBrowser {
         
-        /// <summary>
-        /// JsInclude6 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-        
         /// <summary>
         /// AssemblyName control.
         /// </summary>