diff --git a/lms/templates/course_navigation.html b/lms/templates/course_navigation.html
index 84b0c04ca0..91c253b39e 100644
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
@@ -22,7 +22,7 @@ def url_class(url):
 % endif 
 % endif
 % if settings.WIKI_ENABLED:
-      <li class="wiki"><a href="${reverse('wiki_root', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
+      <li class="wiki"><a href="${reverse('course_wiki', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
 % endif
 % if user.is_authenticated():
       <li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
diff --git a/lms/urls.py b/lms/urls.py
index efb55635be..2ff971c072 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -146,10 +146,6 @@ if settings.WIKI_ENABLED:
     from wiki.urls import get_pattern as wiki_pattern
     from django_notify.urls import get_pattern as notify_pattern
     
-    # urlpatterns += (
-    #     url(r'^wiki/', include('simplewiki.urls')),
-    #     url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/wiki/', include('simplewiki.urls')),
-    # )
     urlpatterns += (        
         # First we include views from course_wiki that we use to override the default views.
         # They come first in the urlpatterns so they get resolved first
@@ -157,8 +153,7 @@ if settings.WIKI_ENABLED:
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/wiki$',
             'course_wiki.views.course_wiki_redirect', name="course_wiki"),
         
-        
-        url(r'wiki/', include(wiki_pattern())),
+        url(r'^wiki/', include(wiki_pattern())),
         url(r'^notify/', include(notify_pattern())),
     )