diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html
index 371babd3..123b1bfa 100644
--- a/helpdesk/templates/helpdesk/navigation.html
+++ b/helpdesk/templates/helpdesk/navigation.html
@@ -17,7 +17,9 @@
                 <li><a href='{% url 'helpdesk_list' %}'><span class="glyphicon glyphicon-tags"></span> <span class="nav-text">{% trans "Tickets" %}</span></a></li>
                 <li><a href='{% url 'helpdesk_submit' %}'><span class="glyphicon glyphicon-plus"></span> <span class="nav-text">{% trans "New Ticket" %}</span></a></li>
                 <li><a href='{% url 'helpdesk_report_index' %}'><span class="glyphicon glyphicon-stats"></span><span class="nav-text"> {% trans "Stats" %}</span></a></li>
+                {% if helpdesk_settings.HELPDESK_KB_ENABLED %}
                 <li><a href='{% url 'helpdesk_kb_index' %}'><span class="glyphicon glyphicon-tree-deciduous"></span><span class="nav-text">{% trans "Knowledgebase" %}</span></a></li>
+                {% endif %}
                 {% if user_saved_queries_ %}
                     <li class="headerlink dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-filter"></span><span class="nav-text"> {% trans "Saved Query" %} <b class="caret"></b></span></a>
                         <ul class="dropdown-menu">
diff --git a/helpdesk/tests/__init__.py b/helpdesk/tests/__init__.py
index 21b52696..a9d48839 100644
--- a/helpdesk/tests/__init__.py
+++ b/helpdesk/tests/__init__.py
@@ -1,2 +1,3 @@
 from helpdesk.tests.ticket_submission import *
 from helpdesk.tests.public_actions import *
+from helpdesk.tests.navigation import *
\ No newline at end of file
diff --git a/helpdesk/tests/helpers.py b/helpdesk/tests/helpers.py
new file mode 100644
index 00000000..6dccad08
--- /dev/null
+++ b/helpdesk/tests/helpers.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+import sys
+try:
+    from django.contrib.auth import get_user_model
+except ImportError:
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
+
+
+def get_staff_user(username='helpdesk.staff', password='password'):
+    try:
+        user = User.objects.get(username=username)
+    except User.DoesNotExist:
+        user = User.objects.create_user(username=username, password=password, email='staff@example.com')
+        user.is_staff = True
+        user.save()
+    else:
+        user.set_password(password)
+        user.save()
+    return user
+
+
+def reload_urlconf(urlconf=None):
+    if urlconf is None:
+        from django.conf import settings
+
+        urlconf = settings.ROOT_URLCONF
+    if urlconf in sys.modules:
+        from django.core.urlresolvers import clear_url_caches
+
+        reload(sys.modules[urlconf])
+        clear_url_caches()
diff --git a/helpdesk/tests/navigation.py b/helpdesk/tests/navigation.py
new file mode 100644
index 00000000..08b049b3
--- /dev/null
+++ b/helpdesk/tests/navigation.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+
+from helpdesk.tests.helpers import get_staff_user, reload_urlconf
+
+
+class TestKBDisabled(TestCase):
+    def setUp(self):
+        from helpdesk import settings
+
+        self.HELPDESK_KB_ENABLED = settings.HELPDESK_KB_ENABLED
+        if self.HELPDESK_KB_ENABLED:
+            settings.HELPDESK_KB_ENABLED = False
+            reload_urlconf()
+
+    def tearDown(self):
+        from helpdesk import settings
+
+        if self.HELPDESK_KB_ENABLED:
+            settings.HELPDESK_KB_ENABLED = True
+            reload_urlconf()
+
+    def test_navigation(self):
+        """Test proper rendering of navigation.html by accessing the dashboard"""
+        from django.core.urlresolvers import NoReverseMatch
+
+        self.client.login(username=get_staff_user().username, password='password')
+        self.assertRaises(NoReverseMatch, reverse, 'helpdesk_kb_index')
+        try:
+            response = self.client.get(reverse('helpdesk_dashboard'))
+        except NoReverseMatch, e:
+            if 'helpdesk_kb_index' in e.message:
+                self.fail("Please verify any unchecked references to helpdesk_kb_index (start with navigation.html)")
+            else:
+                raise
+        else:
+            self.assertEqual(response.status_code, 200)