diff --git a/app/javascript/gabsocial/layouts/about_layout.js b/app/javascript/gabsocial/layouts/about_layout.js
index b3ff9222..a16a74ae 100644
--- a/app/javascript/gabsocial/layouts/about_layout.js
+++ b/app/javascript/gabsocial/layouts/about_layout.js
@@ -79,7 +79,7 @@ class AboutLayout extends React.PureComponent {
 
         {
           me &&
-          <DefaultNavigationBar title={title} noSearch />
+          <DefaultNavigationBar title={title} />
         }
         {
           !me &&
diff --git a/app/javascript/gabsocial/layouts/default_layout.js b/app/javascript/gabsocial/layouts/default_layout.js
index 5799db2c..88cac502 100644
--- a/app/javascript/gabsocial/layouts/default_layout.js
+++ b/app/javascript/gabsocial/layouts/default_layout.js
@@ -15,7 +15,6 @@ class DefaultLayout extends React.PureComponent {
       showBackBtn,
       tabs,
       title,
-      noSearch,
     } = this.props
 
     return (
@@ -28,7 +27,6 @@ class DefaultLayout extends React.PureComponent {
         showBackBtn={showBackBtn}
         tabs={tabs}
         title={title}
-        noSearch={noSearch}
       >
         {children}
       </Layout>
@@ -45,7 +43,6 @@ DefaultLayout.propTypes = {
   noRightSidebar: PropTypes.bool,
   page: PropTypes.string,
   showBackBtn: PropTypes.bool,
-  noSearch: PropTypes.bool,
   tabs: PropTypes.array,
   title: PropTypes.string.isRequired,
 }
diff --git a/app/javascript/gabsocial/layouts/layout.js b/app/javascript/gabsocial/layouts/layout.js
index 83130786..4fa39c63 100644
--- a/app/javascript/gabsocial/layouts/layout.js
+++ b/app/javascript/gabsocial/layouts/layout.js
@@ -38,7 +38,6 @@ class Layout extends React.PureComponent {
       showGlobalFooter,
       tabs,
       title,
-      noSearch,
     } = this.props
 
     const mainBlockClasses = CX({
@@ -64,7 +63,6 @@ class Layout extends React.PureComponent {
             tabs={tabs}
             title={title}
             showBackBtn={showBackBtn}
-            noSearch={noSearch}
           />
         }
         {
@@ -177,7 +175,6 @@ Layout.propTypes = {
   showBackBtn: PropTypes.bool,
   showLinkFooterInSidebar: PropTypes.bool,
   showGlobalFooter: PropTypes.bool,
-  noSearch: PropTypes.bool,
   tabs: PropTypes.array,
   title: PropTypes.string,
 }
diff --git a/app/javascript/gabsocial/layouts/settings_layout.js b/app/javascript/gabsocial/layouts/settings_layout.js
index 7d72da81..16dbbb97 100644
--- a/app/javascript/gabsocial/layouts/settings_layout.js
+++ b/app/javascript/gabsocial/layouts/settings_layout.js
@@ -37,10 +37,7 @@ class SettingsLayout extends React.PureComponent {
           <WrappedBundle component={SidebarXS} />
         </Responsive>
 
-        <DefaultNavigationBar
-          title={title}
-          noSearch
-        />
+        <DefaultNavigationBar title={title} showBackBtn />
 
         <div className={[_s.d, _s.flexRow, _s.w100PC].join(' ')}>
 
diff --git a/app/javascript/gabsocial/pages/groups_page.js b/app/javascript/gabsocial/pages/groups_page.js
index a5d08274..d2da2155 100644
--- a/app/javascript/gabsocial/pages/groups_page.js
+++ b/app/javascript/gabsocial/pages/groups_page.js
@@ -71,7 +71,6 @@ class GroupsPage extends React.PureComponent {
 
     return (
       <DefaultLayout
-        noSearch
         title={title}
         actions={[
           {
diff --git a/app/javascript/gabsocial/pages/notifications_page.js b/app/javascript/gabsocial/pages/notifications_page.js
index 368b33de..d8f5f94b 100644
--- a/app/javascript/gabsocial/pages/notifications_page.js
+++ b/app/javascript/gabsocial/pages/notifications_page.js
@@ -52,7 +52,6 @@ class NotificationsPage extends React.PureComponent {
 
     return (
       <DefaultLayout
-        noSearch
         title={title}
         page='notifications'
         layout={[
diff --git a/app/javascript/gabsocial/pages/settings_page.js b/app/javascript/gabsocial/pages/settings_page.js
index 3196d734..c7137610 100644
--- a/app/javascript/gabsocial/pages/settings_page.js
+++ b/app/javascript/gabsocial/pages/settings_page.js
@@ -5,17 +5,10 @@ import SettingsLayout from '../layouts/settings_layout'
 class SettingsPage extends React.PureComponent {
 	
 	render() {
-		const {
-			children,
-			tabs,
-			title,
-		} = this.props
+		const { children, title } = this.props
 
 		return (
-			<SettingsLayout
-				title={title}
-				tabs={tabs}
-			>
+			<SettingsLayout title={title}>
 				{children}
 			</SettingsLayout>
 		)
@@ -25,7 +18,6 @@ class SettingsPage extends React.PureComponent {
 
 SettingsPage.propTypes = {
 	children: PropTypes.node.isRequired,
-	tabs: PropTypes.array,
 	title: PropTypes.string,
 }
 
diff --git a/app/javascript/gabsocial/pages/shortcuts_page.js b/app/javascript/gabsocial/pages/shortcuts_page.js
index aa708504..9da2aeb5 100644
--- a/app/javascript/gabsocial/pages/shortcuts_page.js
+++ b/app/javascript/gabsocial/pages/shortcuts_page.js
@@ -25,6 +25,7 @@ class ShortcutsPage extends React.PureComponent {
 
     return (
       <DefaultLayout
+        showBackBtn
         title={title}
         page='shortcuts'
         actions={[