diff --git a/browser/main/HomePage.js b/browser/main/HomePage.js
index fc88883f..d9cd38cb 100644
--- a/browser/main/HomePage.js
+++ b/browser/main/HomePage.js
@@ -12,6 +12,9 @@ import api from 'boost/api'
 import auth from 'boost/auth'
 import io from 'boost/socket'
 
+const TEXT_FILTER = 'TEXT_FILTER'
+const FOLDER_FILTER = 'FOLDER_FILTER'
+
 class HomePage extends React.Component {
   componentDidMount () {
     const { dispatch } = this.props
@@ -53,7 +56,7 @@ class HomePage extends React.Component {
       <div className='HomePage'>
         <UserNavigator users={users} />
         <ArticleNavigator dispatch={dispatch} activeUser={activeUser} status={status}/>
-        <ArticleTopBar/>
+        <ArticleTopBar dispatch={dispatch} status={status}/>
         <ArticleList dispatch={dispatch} articles={articles} status={status} activeArticle={activeArticle}/>
         <ArticleDetail dispatch={dispatch} activeUser={activeUser} activeArticle={activeArticle} status={status}/>
       </div>
@@ -72,12 +75,42 @@ function remap (state) {
   let activeUser = findWhere(users, {id: parseInt(status.userId, 10)})
   if (activeUser == null) activeUser = users[0]
 
+  // Fetch articles
   let articles = state.articles['team-' + activeUser.id]
   if (articles == null) articles = []
   articles.sort((a, b) => {
     return new Date(b.updatedAt) - new Date(a.updatedAt)
   })
 
+  // Filter articles
+  let filters = status.search.split(' ').map(key => key.trim()).filter(key => key.length > 0).map(key => {
+    if (key.match(/^in:.+$/)) {
+      return {type: FOLDER_FILTER, value: key.match(/^in:(.+)$/)[1]}
+    }
+    return {type: TEXT_FILTER, value: key}
+  })
+  let folderFilters = filters.filter(filter => filter.type === FOLDER_FILTER)
+  let textFilters = filters.filter(filter => filter.type === TEXT_FILTER)
+
+  let targetFolders = activeUser.Folders.filter(folder => {
+    return findWhere(folderFilters, {value: folder.name})
+  })
+  status.targetFolders = targetFolders
+
+  if (targetFolders.length > 0) {
+    articles = articles.filter(article => {
+      return findWhere(targetFolders, {id: article.FolderId})
+    })
+  }
+  if (textFilters.length > 0) {
+    articles = textFilters.reduce((articles, textFilter) => {
+      return articles.filter(article => {
+        return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i'))
+      })
+    }, articles)
+  }
+
+  // Grab active article
   let activeArticle = findWhere(articles, {key: status.articleKey})
   if (activeArticle == null) activeArticle = articles[0]
 
@@ -120,7 +153,7 @@ function remap (state) {
     articles,
     activeArticle
   }
-  console.log(props)
+
   return props
 }
 
@@ -131,8 +164,7 @@ HomePage.propTypes = {
     userId: PropTypes.string
   }),
   status: PropTypes.shape({
-    userId: PropTypes.string,
-    folderId: PropTypes.number
+    userId: PropTypes.string
   }),
   articles: PropTypes.array,
   activeArticle: PropTypes.shape(),
diff --git a/browser/main/HomePage/ArticleList.js b/browser/main/HomePage/ArticleList.js
index 84e6753b..a9657a03 100644
--- a/browser/main/HomePage/ArticleList.js
+++ b/browser/main/HomePage/ArticleList.js
@@ -15,7 +15,6 @@ export default class ArticleList extends React.Component {
 
   render () {
     let { articles, activeArticle } = this.props
-    console.log(articles)
 
     let articlesEl = articles.map(article => {
       let tags = Array.isArray(article.Tags) && article.Tags.length > 0
diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js
index 963222fa..197555c6 100644
--- a/browser/main/HomePage/ArticleNavigator.js
+++ b/browser/main/HomePage/ArticleNavigator.js
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react'
 import ProfileImage from 'boost/components/ProfileImage'
 import { findWhere } from 'lodash'
-import { switchMode, CREATE_MODE } from 'boost/actions'
+import { setSearchFilter, switchFolder, switchMode, CREATE_MODE } from 'boost/actions'
 import { openModal } from 'boost/modal'
 import FolderMark from 'boost/components/FolderMark'
 import Preferences from 'boost/components/modal/Preferences'
@@ -27,16 +27,30 @@ export default class ArticleNavigator extends React.Component {
     openModal(CreateNewFolder, {user: activeUser})
   }
 
+  handleFolderButtonClick (name) {
+    return e => {
+      let { dispatch } = this.props
+      dispatch(switchFolder(name))
+    }
+  }
+
+  handleAllFoldersButtonClick (e) {
+    let { dispatch } = this.props
+    dispatch(setSearchFilter(''))
+  }
+
   render () {
     let { activeUser, status } = this.props
     if (activeUser == null) return (<div className='ArticleNavigator'/>)
-
-    let activeFolder = findWhere(activeUser.Folders, {id: status.folderId})
+    let { targetFolders } = status
+    if (targetFolders == null) targetFolders = []
 
     let folders = activeUser.Folders != null
       ? activeUser.Folders.map((folder, index) => {
+        let isActive = findWhere(targetFolders, {id: folder.id})
+
         return (
-          <button key={'folder-' + folder.id} className={activeFolder != null && activeFolder.id === folder.id ? 'active' : ''}>
+          <button onClick={e => this.handleFolderButtonClick(folder.name)(e)} key={'folder-' + folder.id} className={isActive ? 'active' : ''}>
           <FolderMark id={folder.id}/> {folder.name} {folder.public ? <i className='fa fa-fw fa-lock'/> : null}</button>
         )
       })
@@ -71,7 +85,7 @@ export default class ArticleNavigator extends React.Component {
             <button onClick={e => this.handleNewFolderButton(e)} className='addBtn'><i className='fa fa-fw fa-plus'/></button>
           </div>
           <div className='folderList'>
-            <button className={activeFolder == null ? 'active' : ''}>All folders</button>
+            <button onClick={e => this.handleAllFoldersButtonClick(e)} className={targetFolders.length === 0 ? 'active' : ''}>All folders</button>
             {folders}
           </div>
         </div>
diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js
index 7f2358bf..848b1df0 100644
--- a/browser/main/HomePage/ArticleTopBar.js
+++ b/browser/main/HomePage/ArticleTopBar.js
@@ -1,14 +1,21 @@
 import React, { PropTypes } from 'react'
 import ExternalLink from 'boost/components/ExternalLink'
+import { setSearchFilter } from 'boost/actions'
+
+export default class ArticleTopBar extends React.Component {
+  handleSearchChange (e) {
+    let { dispatch } = this.props
+
+    dispatch(setSearchFilter(e.target.value))
+  }
 
-const ArticleTopBar = React.createClass({
   render () {
     return (
       <div className='ArticleTopBar'>
         <div className='left'>
           <div className='search'>
             <i className='fa fa-search fa-fw' />
-            <input placeholder='Search' type='text'/>
+            <input value={this.props.status.search} onChange={e => this.handleSearchChange(e)} placeholder='Search' type='text'/>
           </div>
           <button className='refreshBtn'><i className='fa fa-fw fa-refresh'/></button>
         </div>
@@ -22,6 +29,9 @@ const ArticleTopBar = React.createClass({
       </div>
     )
   }
-})
+}
 
-export default ArticleTopBar
+ArticleTopBar.propTypes = {
+  search: PropTypes.string,
+  dispatch: PropTypes.func
+}
diff --git a/lib/actions.js b/lib/actions.js
index b34e0b5c..44afa6a9 100644
--- a/lib/actions.js
+++ b/lib/actions.js
@@ -8,6 +8,7 @@ export const SWITCH_USER = 'SWITCH_USER'
 export const SWITCH_FOLDER = 'SWITCH_FOLDER'
 export const SWITCH_MODE = 'SWITCH_MODE'
 export const SWITCH_ARTICLE = 'SWITCH_ARTICLE'
+export const SET_SEARCH_FILTER = 'SET_SEARCH_FILTER'
 
 // Status - mode
 export const IDLE_MODE = 'IDLE_MODE'
@@ -56,10 +57,10 @@ export function switchUser (userId) {
   }
 }
 
-export function switchFolder (folderId) {
+export function switchFolder (folderName) {
   return {
     type: SWITCH_FOLDER,
-    data: folderId
+    data: folderName
   }
 }
 
@@ -76,3 +77,10 @@ export function switchArticle (articleKey) {
     data: articleKey
   }
 }
+
+export function setSearchFilter (search) {
+  return {
+    type: SET_SEARCH_FILTER,
+    data: search
+  }
+}
diff --git a/lib/reducer.js b/lib/reducer.js
index 9ce652cd..ab00084b 100644
--- a/lib/reducer.js
+++ b/lib/reducer.js
@@ -1,10 +1,11 @@
 import { combineReducers } from 'redux'
 import { findIndex } from 'lodash'
-import { SWITCH_USER, SWITCH_FOLDER, SWITCH_MODE, SWITCH_ARTICLE, USER_UPDATE, ARTICLE_REFRESH, ARTICLE_UPDATE, ARTICLE_DESTROY, IDLE_MODE, CREATE_MODE } from './actions'
+import { SWITCH_USER, SWITCH_FOLDER, SWITCH_MODE, SWITCH_ARTICLE, SET_SEARCH_FILTER, USER_UPDATE, ARTICLE_REFRESH, ARTICLE_UPDATE, ARTICLE_DESTROY, IDLE_MODE, CREATE_MODE } from './actions'
 import auth from 'boost/auth'
 
 const initialStatus = {
-  mode: IDLE_MODE
+  mode: IDLE_MODE,
+  search: ''
 }
 
 function getInitialArticles () {
@@ -39,20 +40,24 @@ function status (state, action) {
     case SWITCH_USER:
       state.userId = action.data
       state.mode = IDLE_MODE
-      state.folderId = null
       return state
     case SWITCH_FOLDER:
-      state.folderId = action.data
       state.mode = IDLE_MODE
+      state.search = `in:${action.data} `
       return state
     case SWITCH_MODE:
       state.mode = action.data
       if (state.mode === CREATE_MODE) state.articleKey = null
+
       return state
     case SWITCH_ARTICLE:
       state.articleKey = action.data
       state.mode = IDLE_MODE
       return state
+    case SET_SEARCH_FILTER:
+      state.search = action.data
+      state.mode = IDLE_MODE
+      return state
     default:
       if (state == null) return initialStatus
       return state
diff --git a/lib/store.js b/lib/store.js
index d55ad269..4934fcae 100644
--- a/lib/store.js
+++ b/lib/store.js
@@ -1,23 +1,6 @@
 import reducer from './reducer'
 import { createStore } from 'redux'
 
-// import React from 'react'
-// import { compose } from 'redux'
-// import { devTools, persistState } from 'redux-devtools'
-// import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react'
-
-// let finalCreateStore = compose(devTools(), persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)))(createStore)
-// let store = finalCreateStore(reducer)
-
-// devToolEl = (
-//   <DebugPanel top right bottom>
-//     <DevTools store={store} monitor={LogMonitor} visibleOnLoad={false}/>
-//   </DebugPanel>
-// )
-
-// export let devToolElement = devToolEl
-// export default store
-
 let store = createStore(reducer)
 
 export let devToolElement = null