diff --git a/static/js/invite.js b/static/js/invite.js
index a08cd4ea6b..af25aa926c 100644
--- a/static/js/invite.js
+++ b/static/js/invite.js
@@ -100,7 +100,7 @@ function submit_invitation_form() {
         complete() {
             $("#submit-invitation").button("reset");
             $("#invitee_emails").focus();
-            ui.get_scroll_element($('#invite_user_form .modal-body'))[0].scrollTop = 0;
+            ui.get_scroll_element($("#invite_user_form .modal-body"))[0].scrollTop = 0;
         },
     });
 }
@@ -176,14 +176,12 @@ exports.launch = function () {
 };
 
 exports.initialize = function () {
-    $(document).on("click", ".invite_check_all_button", (e) => {
+    $(document).on("click", "#invite_check_all_button", () => {
         $("#streams_to_add :checkbox").prop("checked", true);
-        e.preventDefault();
     });
 
-    $(document).on("click", ".invite_uncheck_all_button", (e) => {
+    $(document).on("click", "#invite_uncheck_all_button", () => {
         $("#streams_to_add :checkbox").prop("checked", false);
-        e.preventDefault();
     });
 
     $("#submit-invitation").on("click", () => {
diff --git a/static/templates/invite_subscription.hbs b/static/templates/invite_subscription.hbs
index cf416fe590..9ac969404a 100644
--- a/static/templates/invite_subscription.hbs
+++ b/static/templates/invite_subscription.hbs
@@ -1,7 +1,7 @@
 {{! Client-side Mustache template for rendering subscriptions in the "invite user" form.}}
 <div class="invite-stream-controls">
-    <a href="#" class="invite_check_all_button">{{t "Check all" }}</a> |
-    <a href="#" class="invite_uncheck_all_button">{{t "Uncheck all" }}</a>
+    <button class="btn btn-link" type="button" id="invite_check_all_button">{{t "Check all" }}</button> |
+    <button class="btn btn-link" type="button" id="invite_uncheck_all_button">{{t "Uncheck all" }}</button>
 </div>
 <div id="invite-stream-checkboxes" class="new-style">
     {{#each streams}}