diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
index 928223af6e..f9a440f219 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using umbraco.BasePages;
@@ -87,8 +87,15 @@ function openMedia(id) {
                         }
                         else
                         {
-                            xNode.Action = null;
-                            xNode.DimNode();
+                            if (dd.ContentType.Alias.ToLower() == "folder")
+                            {
+                                xNode.Action = "javascript:jQuery('.umbTree #" + dd.Id.ToString() + "').click();";
+                            }
+                            else
+                            {
+                                xNode.Action = null;
+                                xNode.Style.DimNode();
+                            }
                         }
                     }
                     else
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
index 94e960a52e..5e6000dcc0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
@@ -475,7 +475,7 @@ namespace umbraco
         public static Node GetRandom(this IList<Node> nodes)
         {
             var random = umbraco.library.GetRandom();
-            return nodes[random.Next(0, (nodes.Count - 1))];
+            return nodes[random.Next(0, nodes.Count)];
         }
 
         /// <summary>
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 44579c7d1d..b4636781e3 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -102,6 +102,10 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
+      <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
+      <Name>Umbraco.Web</Name>
+    </ProjectReference>
     <Reference Include="ClientDependency.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=7a99a55a05d191a8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\ClientDependency.Core.dll</HintPath>
@@ -154,10 +158,6 @@
       <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
-      <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
-      <Name>umbraco.presentation</Name>
-    </ProjectReference>
     <ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
       <Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
       <Name>umbraco.macroRenderings</Name>