diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 0f02724e4a..fb04f3b529 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -198,13 +198,9 @@ $(function () {
     $('input, textarea, button').focus(function () {
           allow_hotkeys = false;
     });
-
     $('input, textarea, button').blur(function () {
           allow_hotkeys = true;
     });
-    $("body").delegate("p", "click", function (){
-        select_zephyr(get_id($(this).parent().parent()));
-    });
 });
 
 $(document).keydown(function (event) {
diff --git a/zephyr/static/templates/zephyr.html b/zephyr/static/templates/zephyr.html
index d765c2547a..9b734542be 100644
--- a/zephyr/static/templates/zephyr.html
+++ b/zephyr/static/templates/zephyr.html
@@ -1,6 +1,6 @@
 {{! Client-side Mustache template for rendering zephyrs.}}
 <td class="pointer"><p></p></td>
-<td><p>
+<td><p onclick="select_zephyr({{id}})">
     {{#is_huddle}}
         <span class="hidden zephyr_huddle_recipients_list
                      ">{{#display_recipient}}{{name}}, {{/display_recipient}}</span>