diff --git a/browser/components/StorageItem.js b/browser/components/StorageItem.js
index 801b1d5d..603523b0 100644
--- a/browser/components/StorageItem.js
+++ b/browser/components/StorageItem.js
@@ -4,6 +4,7 @@
 import React, { PropTypes } from 'react'
 import styles from './StorageItem.styl'
 import CSSModules from 'browser/lib/CSSModules'
+import { isNumber } from 'lodash'
 
 /**
  * @param {boolean} isActive
@@ -33,7 +34,7 @@ const StorageItem = ({
     >
       {isFolded ? folderName.substring(0, 1) : folderName}
     </span>
-    {!isFolded &&
+    {(!isFolded && isNumber(noteCount)) &&
       <span styleName='folderList-item-noteCount'>{noteCount}</span>
     }
     {isFolded &&
@@ -51,7 +52,7 @@ StorageItem.propTypes = {
   folderName: PropTypes.string.isRequired,
   folderColor: PropTypes.string,
   isFolded: PropTypes.bool.isRequired,
-  noteCount: PropTypes.number.isRequired,
+  noteCount: PropTypes.number,
 }
 
 export default CSSModules(StorageItem, styles)
diff --git a/browser/finder/StorageSection.js b/browser/finder/StorageSection.js
index 3dfe072a..a8ed2e5e 100644
--- a/browser/finder/StorageSection.js
+++ b/browser/finder/StorageSection.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './StorageSection.styl'
+import StorageItem from 'browser/components/StorageItem'
 
 class StorageSection extends React.Component {
   constructor (props) {
@@ -30,20 +31,17 @@ class StorageSection extends React.Component {
   render () {
     let { storage, filter } = this.props
     let folderList = storage.folders
-      .map((folder) => {
-        return (
-          <button styleName={filter.type === 'FOLDER' && filter.folder === folder.key && filter.storage === storage.key
-              ? 'folderList-item--active'
-              : 'folderList-item'
-            }
-            style={{borderColor: folder.color}}
-            key={folder.key}
-            onClick={(e) => this.handleFolderClick(e, folder)}
-          >
-            {folder.name}
-          </button>
-        )
-      })
+      .map(folder => (
+        <StorageItem
+          key={folder.key}
+          isActive={filter.type === 'FOLDER' && filter.folder === folder.key && filter.storage === storage.key}
+          handleButtonClick={(e) => this.handleFolderClick(e, folder)}
+          folderName={folder.name}
+          folderColor={folder.color}
+          isFolded={false}
+        />
+      ))
+
     return (
       <div styleName='root'>
         <div styleName='header'>