diff --git a/app/renderer/components/bookmarks/addEditBookmarkHanger.js b/app/renderer/components/bookmarks/addEditBookmarkHanger.js
index 6a5c0f5ba63..f3147d50371 100644
--- a/app/renderer/components/bookmarks/addEditBookmarkHanger.js
+++ b/app/renderer/components/bookmarks/addEditBookmarkHanger.js
@@ -185,7 +185,7 @@ class AddEditBookmarkHanger extends React.Component {
     props.currentDetail = currentDetail // TODO (nejc) improve, primitives only
     props.originalDetail = originalDetail // TODO (nejc) improve, primitives only
     props.destinationDetail = bookmarkDetail.get('destinationDetail') // TODO (nejc) improve, primitives only
-    props.hasBookmarks = state.get('sites').find(
+    props.hasBookmarks = state.get('sites').some(
       (site) => siteUtil.isBookmark(site) || siteUtil.isFolder(site)
     )
 
diff --git a/js/state/siteUtil.js b/js/state/siteUtil.js
index b8fe29b9fb0..d7ac67d6b71 100644
--- a/js/state/siteUtil.js
+++ b/js/state/siteUtil.js
@@ -753,11 +753,17 @@ module.exports.getFolder = function (sites, folderId) {
 module.exports.getFolders = function (sites, folderId, parentId, labelPrefix) {
   parentId = parentId || 0
   let folders = []
-  sites.toList().sort(module.exports.siteSort).forEach((site) => {
-    if ((site.get('parentFolderId') || 0) === parentId && module.exports.isFolder(site)) {
+  sites
+    .filter(site => {
+      return (site.get('parentFolderId', 0) === parentId && module.exports.isFolder(site))
+    })
+    .toList()
+    .sort(module.exports.siteSort)
+    .forEach((site) => {
       if (site.get('folderId') === folderId) {
         return
       }
+
       const label = (labelPrefix || '') + (site.get('customTitle') || site.get('title'))
       folders.push({
         folderId: site.get('folderId'),
@@ -766,8 +772,7 @@ module.exports.getFolders = function (sites, folderId, parentId, labelPrefix) {
       })
       const subsites = module.exports.getFolders(sites, folderId, site.get('folderId'), (label || '') + ' / ')
       folders = folders.concat(subsites)
-    }
-  })
+    })
   return folders
 }