diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js
index bcceb3e348..1cf0ee43b2 100644
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -689,6 +689,7 @@ run_test('set_up', () => {
 
     // TEST set_up() here, but this mostly just allows us to
     // get access to the click handlers.
+    settings_org.maybe_disable_widgets = noop;
     settings_org.set_up();
 
     verify_realm_domains();
diff --git a/frontend_tests/node_tests/user_events.js b/frontend_tests/node_tests/user_events.js
index 2963f5ba8b..d4293e51ca 100644
--- a/frontend_tests/node_tests/user_events.js
+++ b/frontend_tests/node_tests/user_events.js
@@ -6,12 +6,23 @@ zrequire('user_events');
 set_global('activity', {
     redraw: function () {},
 });
+
+set_global('settings_filters', {
+    maybe_disable_widgets: function () {},
+});
+set_global('settings_org', {
+    maybe_disable_widgets: function () {},
+});
+set_global('settings_profile_fields', {
+    maybe_disable_widgets: function () {},
+});
+set_global('settings_streams', {
+    maybe_disable_widgets: function () {},
+});
 set_global('settings_users', {
     update_user_data: function () {},
 });
-set_global('admin_sections', {
-    maybe_disable_widgets: function () {},
-});
+
 set_global('gear_menu', {
     update_org_settings_menu_item: function () {},
 });
diff --git a/static/js/admin_sections.js b/static/js/admin_sections.js
index 9f9dff6426..b417185e3a 100644
--- a/static/js/admin_sections.js
+++ b/static/js/admin_sections.js
@@ -4,13 +4,6 @@ var exports = {};
 
 var is_loaded = new Dict(); // section -> bool
 
-exports.maybe_disable_widgets = function () {
-    settings_org.maybe_disable_widgets();
-    settings_streams.maybe_disable_widgets();
-    settings_filters.maybe_disable_widgets();
-    settings_profile_fields.maybe_disable_widgets();
-};
-
 exports.load_admin_section = function (name) {
     var section;
 
@@ -85,8 +78,6 @@ exports.load_admin_section = function (name) {
         return;
     }
 
-    exports.maybe_disable_widgets();
-
     is_loaded.set(section, true);
 };
 
diff --git a/static/js/settings_filters.js b/static/js/settings_filters.js
index eead1accc7..4a5b6198ef 100644
--- a/static/js/settings_filters.js
+++ b/static/js/settings_filters.js
@@ -44,6 +44,11 @@ exports.populate_filters = function (filters_data) {
 };
 
 exports.set_up = function () {
+    exports.build_page();
+    exports.maybe_disable_widgets();
+};
+
+exports.build_page = function () {
     meta.loaded = true;
 
     // create loading indicators
diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 9b39e1ab28..62dc689a02 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -548,6 +548,11 @@ exports.change_save_button_state = function ($element, state) {
 };
 
 exports.set_up = function () {
+    exports.build_page();
+    exports.maybe_disable_widgets();
+};
+
+exports.build_page = function () {
     meta.loaded = true;
 
     loading.make_indicator($('#admin_page_auth_methods_loading_indicator'));
diff --git a/static/js/settings_profile_fields.js b/static/js/settings_profile_fields.js
index 0734185e85..299f0e4be9 100644
--- a/static/js/settings_profile_fields.js
+++ b/static/js/settings_profile_fields.js
@@ -351,7 +351,11 @@ function set_up_choices_field() {
 }
 
 exports.set_up = function () {
+    exports.build_page();
+    exports.maybe_disable_widgets();
+};
 
+exports.build_page = function () {
     // create loading indicators
     loading.make_indicator($('#admin_page_profile_fields_loading_indicator'));
     // Populate profile_fields table
diff --git a/static/js/settings_streams.js b/static/js/settings_streams.js
index 48b17ba7d3..a08911196c 100644
--- a/static/js/settings_streams.js
+++ b/static/js/settings_streams.js
@@ -109,6 +109,11 @@ exports.delete_default_stream = function (stream_name, default_stream_row, alert
 };
 
 exports.set_up = function () {
+    exports.build_page();
+    exports.maybe_disable_widgets();
+};
+
+exports.build_page = function () {
     meta.loaded = true;
 
     exports.update_default_streams_table();
diff --git a/static/js/user_events.js b/static/js/user_events.js
index 2cbadc1f44..92a5ea636c 100644
--- a/static/js/user_events.js
+++ b/static/js/user_events.js
@@ -58,7 +58,10 @@ exports.update_person = function update(person) {
         if (people.is_my_user_id(person.user_id)) {
             page_params.is_admin = person.is_admin;
             gear_menu.update_org_settings_menu_item();
-            admin_sections.maybe_disable_widgets();
+            settings_filters.maybe_disable_widgets();
+            settings_org.maybe_disable_widgets();
+            settings_profile_fields.maybe_disable_widgets();
+            settings_streams.maybe_disable_widgets();
         }
     }