diff --git a/src/common/mwc/handle-request-selected-event.ts b/src/common/mwc/handle-request-selected-event.ts
index 3081ac5af0..239f53e5c3 100644
--- a/src/common/mwc/handle-request-selected-event.ts
+++ b/src/common/mwc/handle-request-selected-event.ts
@@ -1,14 +1,14 @@
 import {
-  RequestSelectedDetail,
   ListItem,
+  RequestSelectedDetail,
 } from "@material/mwc-list/mwc-list-item";
 
 export const shouldHandleRequestSelectedEvent = (
   ev: CustomEvent<RequestSelectedDetail>
 ): boolean => {
-  if (!ev.detail.selected && ev.detail.source !== "property") {
+  if (!ev.detail.selected || ev.detail.source !== "property") {
     return false;
   }
-  (ev.target as ListItem).selected = false;
+  (ev.currentTarget as ListItem).selected = false;
   return true;
 };