diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js
index 96678c4d3d..d58561921b 100644
--- a/frontend_tests/casper_tests/10-admin.js
+++ b/frontend_tests/casper_tests/10-admin.js
@@ -23,6 +23,15 @@ casper.then(function () {
     casper.click("li[data-section='organization-settings']");
 });
 
+function submit_notifications_stream_settings() {
+    casper.waitUntilVisible('#org-submit-notifications[data-status="unsaved"]', function () {
+        casper.test.assertSelectorHasText('#org-submit-notifications', 'Save');
+    });
+    casper.then(function () {
+        casper.click('#org-submit-notifications');
+    });
+}
+
 // Test changing notifications stream
 casper.then(function () {
     casper.test.info('Changing notifications stream to Verona by filtering with "verona"');
@@ -33,6 +42,8 @@ casper.then(function () {
         casper.click("#id_realm_notifications_stream .dropdown-list-body li.stream_name");
     });
 
+    submit_notifications_stream_settings();
+
     casper.waitUntilVisible('#org-submit-notifications[data-status="saved"]', function () {
         casper.test.assertSelectorHasText('#org-submit-notifications', 'Saved');
     });
@@ -40,6 +51,9 @@ casper.then(function () {
 
 casper.then(function () {
     casper.click("#notifications_stream_disable");
+
+    submit_notifications_stream_settings();
+
     casper.waitUntilVisible('#org-submit-notifications[data-status="saved"]', function () {
         casper.test.assertSelectorHasText('#org-submit-notifications', 'Saved');
     });
@@ -55,6 +69,8 @@ casper.then(function () {
         casper.click("#id_realm_signup_notifications_stream .dropdown-list-body li.stream_name");
     });
 
+    submit_notifications_stream_settings();
+
     casper.waitUntilVisible('#org-submit-notifications[data-status="saved"]', function () {
         casper.test.assertSelectorHasText('#org-submit-notifications', 'Saved');
     });
@@ -62,6 +78,9 @@ casper.then(function () {
 
 casper.then(function () {
     casper.click("#signup_notifications_stream_disable");
+
+    submit_notifications_stream_settings();
+
     casper.waitUntilVisible('#org-submit-notifications[data-status="saved"]', function () {
         casper.test.assertSelectorHasText('#org-submit-notifications', 'Saved');
     });
diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 96922e1865..ac082c7dcb 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -192,6 +192,14 @@ function get_property_value(property_name) {
         return JSON.stringify(page_params[property_name]);
     }
 
+    if (property_name === 'realm_notifications_stream') {
+        return page_params.realm_notifications_stream_id;
+    }
+
+    if (property_name === 'realm_signup_notifications_stream') {
+        return page_params.realm_signup_notifications_stream_id;
+    }
+
     return page_params[property_name];
 }
 
@@ -520,6 +528,10 @@ function discard_property_element_changes(elem) {
 
     if (property_name === 'realm_authentication_methods') {
         exports.populate_auth_methods(property_value);
+    } else if (property_name === 'realm_notifications_stream') {
+        exports.render_notifications_stream_ui(property_value, "notifications");
+    } else if (property_name === 'realm_signup_notifications_stream') {
+        exports.render_notifications_stream_ui(property_value, "signup_notifications");
     } else if (typeof property_value === 'boolean') {
         elem.prop('checked', property_value);
     } else if (typeof property_value === 'string' || typeof property_value === 'number') {
@@ -675,6 +687,10 @@ exports.build_page = function () {
             current_val = JSON.stringify(current_val);
             changed_val = get_auth_method_table_data();
             changed_val = JSON.stringify(changed_val);
+        } else if (property_name === 'realm_notifications_stream') {
+            changed_val = parseInt($("#id_realm_notifications_stream").data('stream-id'), 10);
+        } else if (property_name === 'realm_signup_notifications_stream') {
+            changed_val = parseInt($("#id_realm_signup_notifications_stream").data('stream-id'), 10);
         } else if (typeof current_val === 'boolean') {
             changed_val = elem.prop('checked');
         } else if (typeof current_val === 'string') {
@@ -685,7 +701,6 @@ exports.build_page = function () {
         } else {
             blueslip.error('Element refers to unknown property ' + property_name);
         }
-
         return current_val !== changed_val;
     }
 
@@ -786,6 +801,11 @@ exports.build_page = function () {
                 data.message_content_delete_limit_seconds =
                     exports.msg_delete_limit_dropdown_values[delete_limit_setting_value].seconds;
             }
+        } else if (subsection === 'notifications') {
+            data.notifications_stream_id = JSON.stringify(
+                parseInt($('#id_realm_notifications_stream').data('stream-id'), 10));
+            data.signup_notifications_stream_id = JSON.stringify(
+                parseInt($('#id_realm_signup_notifications_stream').data('stream-id'), 10));
         } else if (subsection === 'other_settings') {
             let new_message_retention_days = $("#id_realm_message_retention_days").val();
 
@@ -1074,10 +1094,7 @@ exports.build_page = function () {
 
     function notification_stream_update(stream_id, notification_type) {
         exports.render_notifications_stream_ui(stream_id, notification_type);
-        exports.save_organization_settings({
-            [`${notification_type}_stream_id`]: JSON.stringify(parseInt(stream_id, 10)),
-        }, $("#org-submit-notifications"));
-
+        save_discard_widget_status_handler($('#org-notifications'));
     }
 
     $(".notifications-stream-setting .dropdown-list-body").on("click keypress", ".stream_name", function (e) {
diff --git a/static/templates/settings/notifications_stream_settings_widget.hbs b/static/templates/settings/notifications_stream_settings_widget.hbs
index 803c6c1934..69cc5fb230 100644
--- a/static/templates/settings/notifications_stream_settings_widget.hbs
+++ b/static/templates/settings/notifications_stream_settings_widget.hbs
@@ -1,7 +1,7 @@
 <div class="input-group">
     <label for="realm_{{ notifications_type }}_stream" id="realm_{{ notifications_type }}_stream_label" class="inline-block">
         {{ label }}
-        <span class="notifications-stream-setting dropup actual-dropdown-menu" id="id_realm_{{ notifications_type }}_stream"
+        <span class="notifications-stream-setting dropup actual-dropdown-menu prop-element" id="id_realm_{{ notifications_type }}_stream"
           name="realm_{{ notifications_type }}_stream" aria-labelledby="realm_{{ notifications_type }}_stream_label"
           data-notifications-type="{{ notifications_type }}">
             <button class="button small rounded dropdown-toggle" data-toggle="dropdown">