diff --git a/zephyr/jstemplates/subscription.html b/zephyr/jstemplates/subscription.html
index 5a36496898..aab2da2b74 100644
--- a/zephyr/jstemplates/subscription.html
+++ b/zephyr/jstemplates/subscription.html
@@ -6,8 +6,7 @@
     <div class="subscription_header" data-toggle="collapse" data-target="#subscription_settings_{{id}}">
       <span class="color_swatch" style="background-color: {{color}}"></span>
       <span class="subscription_name">{{name}}</span>
-      <button class="btn btn-block unsubscribe_button" type="button" name="subscription"
-              onclick="subs.unsubscribe_button_click(event);">Unsubscribe</button>
+      <button class="btn btn-block sub_unsub_button" type="button" name="subscription">Unsubscribe</button>
     </div>
 
     <div id="subscription_settings_{{id}}" class="collapse subscription_settings">
diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js
index 6f3aac305f..39d95ffa99 100644
--- a/zephyr/static/js/subs.js
+++ b/zephyr/static/js/subs.js
@@ -77,10 +77,6 @@ var colorpicker_options = {
     }
 };
 
-function get_button_for_stream(stream_name) {
-    return $('#subscription_' + stream_info[stream_name.toLowerCase()].id).find('.unsubscribe_button');
-}
-
 function add_to_stream_list(stream_name) {
     var stream_sub_row;
     var sub;
@@ -97,14 +93,6 @@ function add_to_stream_list(stream_name) {
         sub = removed_streams[lstream_name];
         delete removed_streams[lstream_name];
         stream_info[lstream_name] = sub;
-
-        stream_sub_row = get_button_for_stream(stream_name);
-        stream_sub_row.text("Unsubscribe")
-            .removeClass("btn-primary")
-            .unbind("click")
-            .removeAttr("onclick")
-            .click(function (event) {exports.unsubscribe_button_click(event);});
-
     } else {
         sub = {name: stream_name, id: next_sub_id++, color: default_color,
                render_subscribers: render_subscribers()};
@@ -207,7 +195,7 @@ exports.have = function (stream_name) {
     return (stream_info[stream_name.toLowerCase()] !== undefined);
 };
 
-function ajaxSubscribe(stream) {
+function ajaxSubscribe(stream, button) {
     $.ajax({
         type: "POST",
         url: "/json/subscriptions/add",
@@ -227,6 +215,10 @@ function ajaxSubscribe(stream) {
                                $("#subscriptions-status"));
             }
             add_to_stream_list(name);
+            if (button !== undefined) {
+                button.text("Unsubscribe").removeClass("btn-primary");
+            }
+            typeahead_helper.update_autocomplete();
         },
         error: function (xhr) {
             ui.report_error("Error adding subscription", xhr, $("#subscriptions-status"));
@@ -235,10 +227,7 @@ function ajaxSubscribe(stream) {
     });
 }
 
-exports.unsubscribe_button_click = function (e) {
-    e.preventDefault();
-    e.stopPropagation();
-    var stream = $(e.target).closest('.subscription_row').find('.subscription_name').text();
+function ajaxUnsubscribe(stream, button) {
     $.ajax({
         type: "POST",
         url: "/json/subscriptions/remove",
@@ -255,16 +244,8 @@ exports.unsubscribe_button_click = function (e) {
                 ui.report_success("Successfully removed subscription to " + name,
                                $("#subscriptions-status"));
             }
-            get_button_for_stream(name).text("Subscribe")
-                .addClass("btn-primary")
-                .unbind("click")
-                .removeAttr("onclick")
-                .click(function (e) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    ajaxSubscribe(name);
-                });
             remove_from_stream_list(name);
+            button.text("Subscribe").addClass("btn-primary");
             typeahead_helper.update_autocomplete();
         },
         error: function (xhr) {
@@ -272,7 +253,7 @@ exports.unsubscribe_button_click = function (e) {
             $("#streams").focus();
         }
     });
-};
+}
 
 $(function () {
     var i;
@@ -290,6 +271,20 @@ $(function () {
         return;
     }
 
+    $("#subscriptions_table").on("click", ".sub_unsub_button", function (e) {
+        e.preventDefault();
+        e.stopPropagation();
+        var sub_row = $(e.target).closest('.subscription_row');
+        var stream_name = sub_row.find('.subscription_name').text();
+        var sub = stream_info[stream_name.toLowerCase()];
+
+        if (sub) {
+            ajaxUnsubscribe(stream_name, $(e.target));
+        } else {
+            ajaxSubscribe(stream_name, $(e.target));
+        }
+    });
+
     // From here down is only stuff that happens when we're rendering
     // the subscriber settings
 
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index a14150387d..a497ac7dbc 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -631,7 +631,7 @@ table.floating_recipient {
     margin-right: 10px;
 }
 
-.unsubscribe_button {
+.sub_unsub_button {
     width: 140px;
     float: right;
 }