diff --git a/mayan/apps/dynamic_search/__init__.py b/mayan/apps/dynamic_search/__init__.py
index ba9af28e2e..e5e9885b60 100644
--- a/mayan/apps/dynamic_search/__init__.py
+++ b/mayan/apps/dynamic_search/__init__.py
@@ -1,12 +1,14 @@
 from __future__ import absolute_import
 
-from navigation.api import register_sidebar_template, register_links
+from navigation.api import (register_links, register_sidebar_template,
+                            register_top_menu)
 
-from .links import search, search_advanced, search_again
+from .links import search, search_advanced, search_again, search_menu
 
-register_sidebar_template(['search', 'search_advanced'], 'search_help.html')
+register_sidebar_template(['search:search', 'search:search_advanced'], 'search_help.html')
 
-register_links(['search', 'search_advanced', 'results'], [search, search_advanced], menu_name='form_header')
-register_links(['results'], [search_again], menu_name='sidebar')
+register_links(['search:search', 'search:search_advanced', 'search:results'], [search, search_advanced], menu_name='form_header')
+register_links(['search:results'], [search_again], menu_name='sidebar')
 
-register_sidebar_template(['search', 'search_advanced', 'results'], 'recent_searches.html')
+register_sidebar_template(['search:search', 'search:search_advanced', 'search:results'], 'recent_searches.html')
+register_top_menu('search', search_menu)
diff --git a/mayan/apps/dynamic_search/links.py b/mayan/apps/dynamic_search/links.py
index 3cb73ac99b..00e8f92ad4 100644
--- a/mayan/apps/dynamic_search/links.py
+++ b/mayan/apps/dynamic_search/links.py
@@ -1,5 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 
-search = {'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}
-search_advanced = {'text': _(u'advanced search'), 'view': 'search_advanced', 'famfam': 'zoom_in'}
-search_again = {'text': _(u'search again'), 'view': 'search_again', 'famfam': 'arrow_undo'}
+search = {'text': _(u'search'), 'view': 'search:search', 'famfam': 'zoom'}
+search_advanced = {'text': _(u'advanced search'), 'view': 'search:search_advanced', 'famfam': 'zoom_in'}
+search_again = {'text': _(u'search again'), 'view': 'search:search_again', 'famfam': 'arrow_undo'}
+search_menu = {'text': _(u'search'), 'view': 'search:search', 'famfam': 'zoom', 'children_view_regex': [r'^search:']}
diff --git a/mayan/apps/main/__init__.py b/mayan/apps/main/__init__.py
index 153440f0ba..99dcf524a2 100644
--- a/mayan/apps/main/__init__.py
+++ b/mayan/apps/main/__init__.py
@@ -7,13 +7,11 @@ from navigation.api import register_top_menu
 from project_setup.api import register_setup
 from project_tools.api import register_tool
 
-from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW
+from .conf.settings import DISABLE_HOME_VIEW
 from .links import admin_site, diagnostics, maintenance_menu, sentry
 
 if not DISABLE_HOME_VIEW:
     register_top_menu('home', link={'text': _(u'home'), 'view': 'home', 'famfam': 'house'}, position=0)
-if not SIDE_BAR_SEARCH:
-    register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}, children_path_regex=[r'^search/'])
 
 if 'django.contrib.admin' in settings.INSTALLED_APPS:
     register_setup(admin_site)
diff --git a/mayan/apps/main/conf/settings.py b/mayan/apps/main/conf/settings.py
index d9f2f80dc1..08902e092c 100644
--- a/mayan/apps/main/conf/settings.py
+++ b/mayan/apps/main/conf/settings.py
@@ -3,15 +3,6 @@
 from django.utils.translation import ugettext_lazy as _
 from smart_settings.api import register_setting, register_settings
 
-register_setting(
-    namespace=u'main',
-    module=u'main.conf.settings',
-    name=u'SIDE_BAR_SEARCH',
-    global_name=u'MAIN_SIDE_BAR_SEARCH',
-    default=False,
-    description=_(u'Controls whether the search functionality is provided by a sidebar widget or by a menu entry.')
-)
-
 register_setting(
     namespace=u'main',
     module=u'main.conf.settings',