diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 6c9e55e41dbfe3d97642ca478c2fc3e458bf7dda..9eebad5265d9dc732e0878b1335a352c2c6a210b 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Frontend Error when selecting Database folder in Resources Sidebar
+        https://bugs.webkit.org/show_bug.cgi?id=126029
+
+        Reviewed by Timothy Hatcher.
+
+        Treat the DatabaseHostTreeElement tree element like a folder. It pretty much
+        is a folder, but inherits from StorageTreeElement to share some code there.
+
+        * UserInterface/ResourceSidebarPanel.js:
+        (WebInspector.ResourceSidebarPanel.prototype._treeElementSelected):
+
 2013-12-19  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Uncaught Exception: NavigationSidebarPanel.js: TypeError: undefined is not a function
diff --git a/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js b/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js
index fbb400a47aed12897ebe0f1220861b8d6899d518..1df8c23292c3b7fbdc7fc77ad767ee32f4d659c9 100644
--- a/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js
+++ b/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js
@@ -622,7 +622,7 @@ WebInspector.ResourceSidebarPanel.prototype = {
 
     _treeElementSelected: function(treeElement, selectedByUser)
     {
-        if (treeElement instanceof WebInspector.FolderTreeElement)
+        if (treeElement instanceof WebInspector.FolderTreeElement || treeElement instanceof WebInspector.DatabaseHostTreeElement)
             return;
 
         if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement ||