diff --git a/frameworks/keyed/yew/Cargo.toml b/frameworks/keyed/yew/Cargo.toml
index e18ac269b..45823ef5c 100644
--- a/frameworks/keyed/yew/Cargo.toml
+++ b/frameworks/keyed/yew/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
-name = "js-framework-benchmark-yew"
-version = "1.0.0"
 authors = ["Isamu Mogi <isamu@leafytree.jp>"]
 edition = "2018"
+name = "js-framework-benchmark-yew"
+version = "1.0.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-rand = { version = "0.7.3", features = ["wasm-bindgen", "small_rng"] }
+rand = {version = "0.7.3", features = ["wasm-bindgen", "small_rng"]}
 wasm-bindgen = "0.2.62"
 
 # UPDATE TO USE YOUR BRANCH
-yew = { git = "https://github.com/yewstack/yew", branch = "master" }
+yew = {git = "https://github.com/bakape/yew ", branch = "dev/listener-multiplexer"}
 # UPDATE TO USE YOUR BRANCH
 
 [profile.release]
-lto = true
 codegen-units = 1
+lto = true
 panic = "abort"
 
 [package.metadata.wasm-pack.profile.release]
diff --git a/frameworks/keyed/yew/src/lib.rs b/frameworks/keyed/yew/src/lib.rs
index 57edd4f40..8be5ff687 100644
--- a/frameworks/keyed/yew/src/lib.rs
+++ b/frameworks/keyed/yew/src/lib.rs
@@ -296,11 +296,11 @@ impl Component for Row {
             <tr class=if self.props.selected { "danger" } else  { "" }>
                 <td class="col-md-1">{ self.props.data.id }</td>
                 <td class="col-md-4" onclick=self.state.on_select.clone()>
-                    <a class="lbl">{ self.props.data.label.clone() }</a>
+                    <a class="lbl" onclick=self.state.on_select.clone()>{ self.props.data.label.clone() }</a>
                 </td>
                 <td class="col-md-1">
                     <a class="remove" onclick=self.state.on_remove.clone()>
-                        <span class="glyphicon glyphicon-remove remove" aria-hidden="true"></span>
+                        <span class="glyphicon glyphicon-remove remove" aria-hidden="true" onclick=self.state.on_remove.clone()></span>
                     </a>
                 </td>
                 <td class="col-md-6"></td>