diff --git a/app/src/App.tsx b/app/src/App.tsx
index 4a3aba6..ea24837 100644
--- a/app/src/App.tsx
+++ b/app/src/App.tsx
@@ -104,7 +104,7 @@ class App extends React.Component<Props, {}> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    settingsVisible: state.tooBigReducer.settings.visible,
+    settingsVisible: state.settings.visible,
     connectionId: state.connection.connectionId,
   }
 }
diff --git a/app/src/actions/Settings.ts b/app/src/actions/Settings.ts
index a620ead..e6b0971 100644
--- a/app/src/actions/Settings.ts
+++ b/app/src/actions/Settings.ts
@@ -1,21 +1,28 @@
-import { ActionTypes, NodeOrder, CustomAction } from '../reducers'
+import { Action, ActionTypes, TopicOrder } from '../reducers/Settings'
 
-export const setAutoExpandLimit = (autoExpandLimit: number = 0): CustomAction => {
+export const setAutoExpandLimit = (autoExpandLimit: number = 0): Action => {
   return {
     autoExpandLimit,
-    type: ActionTypes.setAutoExpandLimit,
+    type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
   }
 }
 
-export const toggleSettingsVisibility = (): CustomAction => {
+export const toggleSettingsVisibility = (): Action => {
   return {
-    type: ActionTypes.toggleSettingsVisibility,
+    type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY,
   }
 }
 
-export const setNodeOrder = (nodeOrder: NodeOrder = NodeOrder.none): CustomAction => {
+export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none): Action => {
   return {
-    nodeOrder,
-    type: ActionTypes.setNodeOrder,
+    topicOrder,
+    type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
+  }
+}
+
+export const filterTopics = (topicFilter: string): Action => {
+  return {
+    topicFilter,
+    type: ActionTypes.SETTINGS_FILTER_TOPICS,
   }
 }
diff --git a/app/src/components/Settings.tsx b/app/src/components/Settings.tsx
index 2a5114c..adfcefe 100644
--- a/app/src/components/Settings.tsx
+++ b/app/src/components/Settings.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as q from '../../../backend/src/Model'
 
-import { AppState, NodeOrder } from '../reducers'
+import { AppState } from '../reducers'
 import {
   Divider,
   Drawer,
@@ -18,6 +18,7 @@ import ChevronRight from '@material-ui/icons/ChevronRight'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { settingsActions } from '../actions'
+import { TopicOrder } from '../reducers/Settings'
 
 const styles: StyleRulesCallback = theme => ({
   drawer: {
@@ -44,7 +45,7 @@ interface Props {
   visible: boolean
   store?: any
   classes: any
-  nodeOrder: NodeOrder
+  topicOrder: TopicOrder
 }
 
 class Settings extends React.Component<Props, {}> {
@@ -110,23 +111,23 @@ class Settings extends React.Component<Props, {}> {
   }
 
   private renderNodeOrder() {
-    const { classes, nodeOrder } = this.props
+    const { classes, topicOrder } = this.props
 
     return (
       <div style={{ padding: '8px' }}>
       <InputLabel htmlFor="auto-expand">Topic order</InputLabel>
       <Select
-          value={nodeOrder}
+          value={topicOrder}
           onChange={this.onChangeSorting}
           input={<Input name="node-order" id="node-order-label-placeholder" />}
           displayEmpty={true}
           name="node-order"
           className={classes.input}
       >
-        <MenuItem value={NodeOrder.none}><em>default</em></MenuItem>
-        <MenuItem value={NodeOrder.abc}>a-z</MenuItem>
-        <MenuItem value={NodeOrder.messages}>{NodeOrder.messages}</MenuItem>
-        <MenuItem value={NodeOrder.topics}>{NodeOrder.topics}</MenuItem>
+        <MenuItem value={TopicOrder.none}><em>default</em></MenuItem>
+        <MenuItem value={TopicOrder.abc}>a-z</MenuItem>
+        <MenuItem value={TopicOrder.messages}>{TopicOrder.messages}</MenuItem>
+        <MenuItem value={TopicOrder.topics}>{TopicOrder.topics}</MenuItem>
       </Select>
     </div>)
   }
@@ -138,9 +139,9 @@ class Settings extends React.Component<Props, {}> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    autoExpandLimit: state.tooBigReducer.settings.autoExpandLimit,
-    nodeOrder: state.tooBigReducer.settings.nodeOrder,
-    visible: state.tooBigReducer.settings.visible,
+    autoExpandLimit: state.settings.autoExpandLimit,
+    topicOrder: state.settings.topicOrder,
+    visible: state.settings.visible,
   }
 }
 
diff --git a/app/src/components/Sidebar/History.tsx b/app/src/components/Sidebar/History.tsx
index bba83e1..60a9f0f 100644
--- a/app/src/components/Sidebar/History.tsx
+++ b/app/src/components/Sidebar/History.tsx
@@ -54,6 +54,7 @@ class MessageHistory extends React.Component<Props, State> {
     return (
       <div style={{ backgroundColor: 'rgba(60, 60, 60, 0.6)', marginTop: '16px' }}>
         <Typography
+          component={'span'}
           onClick={this.toggle}
           style={{ cursor: 'pointer' }}
         >
diff --git a/app/src/components/TitleBar.tsx b/app/src/components/TitleBar.tsx
index d631fe2..9e57a9a 100644
--- a/app/src/components/TitleBar.tsx
+++ b/app/src/components/TitleBar.tsx
@@ -11,6 +11,7 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { fade } from '@material-ui/core/styles/colorManipulator'
 import { settingsActions, connectionActions } from '../actions'
+import { AppState } from '../reducers'
 
 const styles: StyleRulesCallback = theme => ({
   title: {
@@ -70,22 +71,13 @@ interface Props {
     settings: typeof settingsActions,
     connection: typeof connectionActions,
   }
+  topicFilter?: string
 }
 
-interface State {
-  selectedNode?: q.TreeNode
-  settingsVisible: boolean
-  autoExpandLimit: number
-}
-
-class TitleBar extends React.Component<Props, State> {
+class TitleBar extends React.Component<Props, {}> {
   constructor(props: any) {
     super(props)
-    this.state = {
-      selectedNode: undefined,
-      settingsVisible: false,
-      autoExpandLimit: 0,
-    }
+    this.state = { }
   }
 
   public render() {
@@ -98,6 +90,7 @@ class TitleBar extends React.Component<Props, State> {
             <Menu />
           </IconButton>
           <Typography className={classes.title} variant="h6" color="inherit">MQTT-Explorer</Typography>
+          {this.renderSearch()}
           <Button style={{ margin: 'auto 8px auto auto' }} onClick={actions.connection.disconnect}>
             Disconnect <CloudOff style={{ marginRight: '8px', paddingLeft: '8px' }}/>
           </Button>
@@ -115,12 +108,24 @@ class TitleBar extends React.Component<Props, State> {
           <Search />
         </div>
         <InputBase
+          value={this.props.topicFilter}
+          onChange={this.onFilterChange}
           placeholder="Search…"
           classes={{ root: classes.inputRoot, input: classes.inputInput }}
         />
       </div>
     )
   }
+
+  private onFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    this.props.actions.settings.filterTopics(event.target.value)
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    topicFilter: state.settings.topicFilter,
+  }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
@@ -132,4 +137,4 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(TitleBar))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(TitleBar))
diff --git a/app/src/components/Tree/Tree.tsx b/app/src/components/Tree/Tree.tsx
index 10f2397..d2cf7c5 100644
--- a/app/src/components/Tree/Tree.tsx
+++ b/app/src/components/Tree/Tree.tsx
@@ -89,9 +89,7 @@ class Tree extends React.Component<Props, {}> {
       <div style={style}>
         <TreeNode
           animateChages={true}
-          autoExpandLimit={this.props.autoExpandLimit}
           isRoot={true}
-          didSelectNode={this.props.didSelectNode}
           treeNode={this.props.tree}
           name="/"
           collapsed={false}
@@ -110,7 +108,7 @@ class Tree extends React.Component<Props, {}> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    autoExpandLimit: state.tooBigReducer.settings.autoExpandLimit,
+    autoExpandLimit: state.settings.autoExpandLimit,
     tree: state.connection.tree,
   }
 }
diff --git a/app/src/components/Tree/TreeNode.tsx b/app/src/components/Tree/TreeNode.tsx
index 7492334..d1e0c3b 100644
--- a/app/src/components/Tree/TreeNode.tsx
+++ b/app/src/components/Tree/TreeNode.tsx
@@ -10,6 +10,7 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { isElementInViewport } from '../helper/isElementInViewport'
 import { treeActions } from '../../actions'
+import { AppState } from '../../reducers'
 
 declare var performance: any
 
@@ -40,7 +41,7 @@ const styles = (theme: Theme) => {
 }
 
 interface Props {
-  actions: any
+  actions: typeof treeActions
   lastUpdate: number
   animateChages: boolean
   isRoot?: boolean
@@ -48,9 +49,8 @@ interface Props {
   name?: string | undefined
   collapsed?: boolean | undefined
   performanceCallback?: ((ms: number) => void) | undefined
-  didSelectNode?: (node: q.TreeNode) => void
-  classes: any
   autoExpandLimit: number
+  classes: any
   style?: React.CSSProperties
 }
 
@@ -220,7 +220,6 @@ class TreeNode extends React.Component<Props, State> {
         animateChanges={this.props.animateChages}
         collapsed={this.collapsed()}
         autoExpandLimit={this.props.autoExpandLimit}
-        didSelectNode={this.props.didSelectNode}
         treeNode={this.props.treeNode}
         lastUpdate={this.props.treeNode.lastUpdate}
       />
@@ -234,4 +233,10 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default withStyles(styles)(connect(null, mapDispatchToProps)(TreeNode))
+const mapStateToProps = (state: AppState) => {
+  return {
+    autoExpandLimit: state.settings.autoExpandLimit,
+  }
+}
+
+export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(TreeNode))
diff --git a/app/src/components/Tree/TreeNodeSubnodes.tsx b/app/src/components/Tree/TreeNodeSubnodes.tsx
index 150ca1d..c198793 100644
--- a/app/src/components/Tree/TreeNodeSubnodes.tsx
+++ b/app/src/components/Tree/TreeNodeSubnodes.tsx
@@ -1,15 +1,16 @@
 import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
 
-import { AppState, NodeOrder } from '../../reducers'
+import { AppState } from '../../reducers'
 import { Theme, withTheme } from '@material-ui/core/styles'
 
 import TreeNode from './TreeNode'
 import { connect } from 'react-redux'
+import { TopicOrder } from '../../reducers/Settings'
 
 export interface Props {
   lastUpdate: number
-  nodeOrder?: NodeOrder
+  topicOrder?: TopicOrder
   animateChanges: boolean
   treeNode: q.TreeNode
   autoExpandLimit: number
@@ -20,18 +21,18 @@ export interface Props {
 
 class TreeNodeSubnodes extends React.Component<Props, {}> {
   private sortedNodes(): q.TreeNode[] {
-    const { nodeOrder, treeNode } = this.props
+    const { topicOrder, treeNode } = this.props
 
     let edges = Object.values(treeNode.edges)
-    if (nodeOrder === NodeOrder.abc) {
+    if (topicOrder === TopicOrder.abc) {
       edges = edges.sort((a, b) => a.name.localeCompare(b.name))
     }
 
     let nodes = edges.map(edge => edge.target)
-    if (nodeOrder === NodeOrder.messages) {
+    if (topicOrder === TopicOrder.messages) {
       nodes = nodes.sort((a, b) => b.leafMessageCount() - a.leafMessageCount())
     }
-    if (nodeOrder === NodeOrder.topics) {
+    if (topicOrder === TopicOrder.topics) {
       nodes = nodes.sort((a, b) => b.leafCount() - a.leafCount())
     }
 
@@ -54,8 +55,6 @@ class TreeNodeSubnodes extends React.Component<Props, {}> {
           <TreeNode
             animateChages={this.props.animateChanges}
             treeNode={node}
-            didSelectNode={this.props.didSelectNode}
-            autoExpandLimit={this.props.autoExpandLimit}
             lastUpdate={node.lastUpdate}
             style={listItemStyle}
           />
@@ -72,7 +71,7 @@ class TreeNodeSubnodes extends React.Component<Props, {}> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    nodeOrder: state.tooBigReducer.settings.nodeOrder,
+    topicOrder: state.settings.topicOrder,
   }
 }
 
diff --git a/app/src/index.tsx b/app/src/index.tsx
index 9df8a37..1ca4e5d 100644
--- a/app/src/index.tsx
+++ b/app/src/index.tsx
@@ -5,7 +5,7 @@ import * as ReactDOM from 'react-dom'
 import reduxThunk from 'redux-thunk'
 
 import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'
-import reducers, { AppState, NodeOrder } from './reducers'
+import reducers from './reducers'
 
 import App from './App'
 import { Provider } from 'react-redux'
diff --git a/app/src/reducers/index.ts b/app/src/reducers/index.ts
index 923d72c..79af269 100644
--- a/app/src/reducers/index.ts
+++ b/app/src/reducers/index.ts
@@ -5,22 +5,16 @@ import { Action, Reducer, combineReducers } from 'redux'
 import { trackEvent } from '../tracking'
 import { PublishState, publishReducer } from './Publish'
 import { ConnectionState, connectionReducer } from './Connection'
+import { SettingsState, settingsReducer } from './Settings'
 
 export enum ActionTypes {
-
-  setAutoExpandLimit = 'SET_AUTO_EXPAND_LIMIT',
-  toggleSettingsVisibility = 'TOGGLE_SETTINGS_VISIBILITY',
-  setNodeOrder = 'SET_NODE_ORDER',
   selectTopic = 'SELECT_TOPIC',
   showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
   showUpdateDetails = 'SHOW_UPDATE_DETAILS',
-
 }
 
 export interface CustomAction extends Action {
   type: ActionTypes,
-  autoExpandLimit?: number
-  nodeOrder?: NodeOrder
   selectedTopic?: q.TreeNode
   showUpdateNotification?: boolean
   showUpdateDetails?: boolean
@@ -28,36 +22,18 @@ export interface CustomAction extends Action {
 
 export interface AppState {
   tooBigReducer: TooBigOfState
+  settings: SettingsState,
   publish: PublishState
   connection: ConnectionState
 }
 
 export interface TooBigOfState {
-  settings: SettingsState,
   selectedTopic?: q.TreeNode
   showUpdateNotification?: boolean
   showUpdateDetails: boolean
 }
 
-export interface SettingsState {
-  autoExpandLimit: number
-  visible: boolean
-  nodeOrder: NodeOrder
-}
-
-export enum NodeOrder {
-  none = 'none',
-  messages = '#messages',
-  abc = 'abc',
-  topics = '#topics',
-}
-
 const initialBigState: TooBigOfState = {
-  settings: {
-    autoExpandLimit: 0,
-    nodeOrder: NodeOrder.none,
-    visible: false,
-  },
   selectedTopic: undefined,
   showUpdateDetails: false,
 }
@@ -69,27 +45,6 @@ const tooBigReducer: Reducer<TooBigOfState | undefined, CustomAction> = (state =
   trackEvent(action.type)
   console.log(action, state)
   switch (action.type) {
-    case ActionTypes.setAutoExpandLimit:
-      if (action.autoExpandLimit === undefined) {
-        return state
-      }
-      return {
-        ...state,
-        settings: {
-          ...state.settings,
-          autoExpandLimit: action.autoExpandLimit,
-        },
-      }
-
-    case ActionTypes.toggleSettingsVisibility:
-      return {
-        ...state,
-        settings: {
-          ...state.settings,
-          visible: !state.settings.visible,
-        },
-      }
-
     case ActionTypes.selectTopic:
       if (!action.selectedTopic) {
         return state
@@ -99,15 +54,6 @@ const tooBigReducer: Reducer<TooBigOfState | undefined, CustomAction> = (state =
         selectedTopic: action.selectedTopic,
       }
 
-    case ActionTypes.setNodeOrder:
-      if (!action.nodeOrder) {
-        return state
-      }
-      return {
-        ...state,
-        settings: { ...state.settings, nodeOrder: action.nodeOrder },
-      }
-
     case ActionTypes.showUpdateNotification:
       return {
         ...state,
@@ -132,6 +78,7 @@ const reducer = combineReducers({
   tooBigReducer,
   publish: publishReducer,
   connection: connectionReducer,
+  settings: settingsReducer,
 })
 
 export default reducer