diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
index b376a5fcbf..652af27d16 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
@@ -41,7 +41,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
             pnl_connectionerror.Visible = false;
 
             //load dependencies
-            if (ActiveSkin != null)
+            if (ActiveSkin != null && ActiveSkin.Dependencies.Count > 0)
                 LoadDependencies();
             else
             {
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
index 438b60237a..0d0f6721cb 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
@@ -38,6 +38,10 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
         {
             base.CreateChildControls();
 
+
+            Skin ActiveSkin = Skin.CreateFromAlias(Skinning.GetCurrentSkinAlias(nodeFactory.Node.GetCurrent().template));
+
+
             m_SkinModal = new Panel();
             m_SkinModal.ID = "LeSkinModal";
             m_SkinModal.Attributes.Add("style", "display: none");
@@ -48,10 +52,10 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
 
             m_SkinButton.ID = "LeSkinButton";
             m_SkinButton.CssClass = "button";
-            m_SkinButton.ToolTip = "Customize skin";
+            m_SkinButton.ToolTip = ActiveSkin != null && ActiveSkin.Dependencies.Count > 0 ? "Customize skin" : "Change skin";
             m_SkinButton.ImageUrl = String.Format("{0}/LiveEditing/Modules/SKinModule/skin.png", SystemDirectories.Umbraco);
 
-            string s = (Skin.CreateFromAlias(Skinning.GetCurrentSkinAlias(nodeFactory.Node.GetCurrent().template)) != null ? "setTasksClientScripts();" : "") + "jQuery('#" + m_SkinModal.ClientID + @"').show();" + "jQuery('#" + m_SkinModal.ClientID + @"').ModalWindowShow('" + ui.GetText("skin") + "',true,500,400,50,0, ['.modalbuton'], null);";
+            string s = (ActiveSkin != null && ActiveSkin.Dependencies.Count > 0 ? "setTasksClientScripts();" : "") + "jQuery('#" + m_SkinModal.ClientID + @"').show();" + "jQuery('#" + m_SkinModal.ClientID + @"').ModalWindowShow('" + ui.GetText("skin") + "',true,500,400,50,0, ['.modalbuton'], null);";
 
             m_SkinButton.OnClientClick = s +"return false;";