diff --git a/src/containers/App.js b/src/containers/App.js
index 23277f24..235dd7a8 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { loadConfig } from '../actions/config';
 import { loginUser } from '../actions/auth';
 import { currentBackend } from '../backends/backend';
+import FindBar from './FindBar';
 
 class App extends React.Component {
   componentDidMount() {
@@ -50,6 +51,14 @@ class App extends React.Component {
   render() {
     const { user, config, children } = this.props;
 
+    const commands = [
+      { pattern: 'Create new Post(:postName)' },
+      { pattern: 'Create new FAQ item(:faqName as FAQ item name)' },
+      { pattern: 'Add new User(:userName as User name)' },
+      { pattern: 'Go to Settings' },
+    ];
+
+
     if (config === null) {
       return null;
     }
@@ -67,7 +76,10 @@ class App extends React.Component {
     }
 
     return (
-      <div>{children}</div>
+      <div>
+        <FindBar commands={commands} />
+        {children}
+      </div>
     );
   }
 }
diff --git a/src/containers/CollectionPage.js b/src/containers/CollectionPage.js
index 93552691..8d8b12b4 100644
--- a/src/containers/CollectionPage.js
+++ b/src/containers/CollectionPage.js
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import { loadEntries } from '../actions/entries';
 import { selectEntries } from '../reducers';
 import EntryListing from '../components/EntryListing';
-import FindBar from './FindBar';
 
 class DashboardPage extends React.Component {
   componentDidMount() {
@@ -29,16 +28,8 @@ class DashboardPage extends React.Component {
       return <h1>No collections defined in your config.yml</h1>;
     }
 
-    const commands = [
-      { pattern: 'Create Collections(:collectionName)' },
-      { pattern: 'Create Posts(:postName)' },
-      { pattern: 'Find(:seachTerm as what?)' },
-      { pattern: '(:searchTerm as Find...)' }
-    ];
-
     return <div>
       <h1>Dashboard</h1>
-      <FindBar commands={commands} />
       <div>
         {collections.map((collection) => (
           <div key={collection.get('name')}>