diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index fdcf8f3928b..b79ba189ecc 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -5,10 +5,6 @@
   "content": "Chat",
   "link": "//gitter.im/FreeCodeCamp/FreeCodeCamp",
   "target": "_blank"
-},{
-  "content": "Wiki",
-  "link": "/wiki",
-  "target": "_blank"
 },{
   "content": "Forum",
   "link": "http://forum.freecodecamp.com/",
@@ -18,6 +14,5 @@
   "link": "/about"
 },{
   "content": "Shop",
-  "link": "/shop",
-  "target": "_blank"
+  "link": "/shop"
 }]
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index d165c024fd7..9d9ffbaa8a5 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -15,16 +15,12 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 a#nav-chat-btn(href='//gitter.im/freecodecamp/freecodecamp' onclick="if (!(event.ctrlKey || event.metaKey)) {return false;}") Chat
             li.visible-xs
                 a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
-            li.hidden-xs
-                a#nav-wiki-btn(href='/wiki' onclick='if (!(event.ctrlKey || event.metaKey)) {return false;}') Wiki
-            li.visible-xs
-                a(href='/wiki', target='_blank') Wiki
             li
-                a(href='http://forum.freecodecamp.com', target='_blank') Forum                
+                a(href='http://forum.freecodecamp.com', target='_blank') Forum
             li
                 a(href='/about') About
             li
-                a(href='/shop', target='_blank') Shop
+                a(href='/shop') Shop
             if !user
                 li
                     a(href='/signin') Sign in
@@ -33,4 +29,4 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                   a(href='/' + user.username) [ #{user.points} ]
                 li.hidden-xs.hidden-sm.avatar
                   a(href='/' + user.username)
-                        img.profile-picture.float-right(src='#{user.picture}')
\ No newline at end of file
+                        img.profile-picture.float-right(src='#{user.picture}')