diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 4e9a595550..de434a958a 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -2910,7 +2910,7 @@ def __init__(self, tabs):
         for tab_name, title, pane in tabs:
             buttons.append(JsButton(title, onclick="return select_tab_menu(this, '%s');" % tab_name))
 
-        self.tabmenu = JsNavMenu(buttons, type = 'tabpane')
+        self.tabmenu = JsNavMenu(buttons, type = 'tabmenu')
         self.tabs = tabs
 
         Templated.__init__(self)
diff --git a/r2/r2/public/static/js/reddit.js b/r2/r2/public/static/js/reddit.js
index d27270191b..f9832fe857 100644
--- a/r2/r2/public/static/js/reddit.js
+++ b/r2/r2/public/static/js/reddit.js
@@ -33,6 +33,16 @@ function close_menus(event) {
 
 function hover_open_menu(menu) { };
 
+function select_tab_menu(tab_link, tab_name) {
+    var target = "tabbedpane-" + tab_name;
+    var menu = $(tab_link).parent().parent().parent();
+    menu.find(".tabmenu li").removeClass("selected");
+    $(tab_link).parent().addClass("selected");
+    menu.find(".tabbedpane").each(function() {
+        this.style.display = (this.id == target) ? "block" : "none";
+      });
+}
+
 function update_user(form) {
   try {
     var user = $(form).find('input[name="user"]').val();