diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 6d7896f534..56a2666f96 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -256,10 +256,8 @@ function get_id(zephyr_row) {
     return zephyr_row.attr('zid');
 }
 
-// NB: this is slow (50 ms or more) due to the custom attribute.
-// We instead could compute an id based on the zid and focused table.
 function get_zephyr(zephyr_id) {
-    return $("table.focused_table [zid=" + zephyr_id + "]");
+    return $('#' + (narrowed ? 'zfilt' : 'zhome') + zephyr_id);
 }
 
 function scroll_to_selected() {