diff --git a/static/js/hashchange.js b/static/js/hashchange.js
index 085e17b0e1..fa758d5f4a 100644
--- a/static/js/hashchange.js
+++ b/static/js/hashchange.js
@@ -243,7 +243,11 @@ function do_hashchange_overlay(old_hash) {
         settings_hashes.has(base) && settings_hashes.has(old_base) && overlays.settings_open();
     if (is_hashchange_internal) {
         settings_toggle.highlight_toggle(base);
-        settings_panel_menu.normal_settings.activate_section_or_default(section);
+        if (base === "settings") {
+            settings_panel_menu.normal_settings.activate_section_or_default(section);
+        } else {
+            settings_panel_menu.org_settings.activate_section_or_default(section);
+        }
         return;
     }