diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
index 968532019c..a5a7389b59 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
@@ -20,6 +20,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
 
                 this.selected(true);
             };
+            item.edit = function () {
+                //TODO: Could do with a better way of getting to the parent control
+                $(".umbFolderBrowser").folderBrowserApi()._editItem(this.Id());
+            };
             return item;
         }
     };
diff --git a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
index 3b6db75e7b..3e8b84be38 100644
--- a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
+++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
@@ -117,7 +117,7 @@ namespace Umbraco.Web.UI.Controls
 
             // Create thumbnails container
             sb.Append("<ul class='items' data-bind='foreach: filtered'>" +
-                      "<li data-bind=\"attr: { 'data-id': Id, 'data-order': $index() }, css: { selected: selected() }, event: { mousedown: toggleSelected, contextmenu: toggleSelected }\"><div><span class='img'><img data-bind='attr: { src: ThumbnailUrl }' /></span><span data-bind='text: Name'></span></div></li>" +
+                      "<li data-bind=\"attr: { 'data-id': Id, 'data-order': $index() }, css: { selected: selected() }, event: { mousedown: toggleSelected, contextmenu: toggleSelected, dblclick: edit }\"><div><span class='img'><img data-bind='attr: { src: ThumbnailUrl }' /></span><span data-bind='text: Name'></span></div></li>" +
                       "</ul>");
 
             panel.Controls.Add(new LiteralControl(sb.ToString()));