diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html b/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html
index fcfca74f9d..5329f29a46 100644
--- a/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html
+++ b/geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html
@@ -1,5 +1,6 @@
 {% load static %}
 {% load get_menu_json %}
+{% load catalogue_urls %}
 {% get_user_menu as USER_MENU %}
 
 {% block extra_style %}
@@ -11,7 +12,7 @@
                 {% block left_menu %}
                 <ul class="gn-menu-list">
                     <li>
-                        <a href="{% block logo_href %}#{% endblock %}">
+                        <a href="{% block logo_href %}{% catalogue_home %}{% endblock %}">
                             {% if custom_theme.logo and custom_theme.logo.url %}
                                 <img src="{{ custom_theme.logo.url }}">
                             {% else %}
diff --git a/geonode_mapstore_client/templatetags/catalogue_urls.py b/geonode_mapstore_client/templatetags/catalogue_urls.py
new file mode 100644
index 0000000000..5dc24fded1
--- /dev/null
+++ b/geonode_mapstore_client/templatetags/catalogue_urls.py
@@ -0,0 +1,19 @@
+import os
+import logging
+
+from django import template
+
+logger = logging.getLogger(__name__)
+register = template.Library()
+
+@register.simple_tag(takes_context=True)
+def catalogue_home(context):
+    if context and 'request' in context:
+        current_path = context['request'].path
+        if current_path == '/':
+            return "/"
+        elif current_path.find('/catalogue') == 0:
+            return "#"
+        else:
+            return "/catalogue/#"
+    return ""