diff --git a/frontend/src/metabase/components/CollectionLanding.jsx b/frontend/src/metabase/components/CollectionLanding.jsx
index fda2907c271ca3b9f79460293230d06d22fe89d2..64c786b2cbd36f4e19635b6cfdd68b3657ee4b93 100644
--- a/frontend/src/metabase/components/CollectionLanding.jsx
+++ b/frontend/src/metabase/components/CollectionLanding.jsx
@@ -220,8 +220,7 @@ class DefaultLanding extends React.Component {
                                     : null
                                 }
                                 selected={selection.has(item)}
-                                onToggleSelected={ev => {
-                                  ev.preventDefault();
+                                onToggleSelected={() => {
                                   onToggleSelected(item);
                                 }}
                               />
diff --git a/frontend/src/metabase/components/EntityItem.jsx b/frontend/src/metabase/components/EntityItem.jsx
index 6a9aca3530693a3734b05705098fbd717f952d30..bf4c5fb9e3aeeda0b2128d820346a84384dc8b7e 100644
--- a/frontend/src/metabase/components/EntityItem.jsx
+++ b/frontend/src/metabase/components/EntityItem.jsx
@@ -57,17 +57,25 @@ const EntityItem = ({
 
   return (
     <EntityItemWrapper py={2} px={2} className="hover-parent hover--visibility">
-      <IconWrapper p={1} mr={1} align="center" justify="center">
+      <IconWrapper
+        p={1}
+        mr={1}
+        align="center"
+        justify="center"
+        onClick={
+          selectable
+            ? e => {
+                e.preventDefault();
+                onToggleSelected();
+              }
+            : null
+        }
+      >
         {selectable ? (
           <Swapper
             startSwapped={showSelect}
             defaultElement={<Icon name={iconName} color={iconColor} />}
-            swappedElement={
-              <CheckBox
-                checked={selected}
-                onChange={ev => onToggleSelected(ev)}
-              />
-            }
+            swappedElement={<CheckBox checked={selected} />}
           />
         ) : (
           <Icon name={iconName} color={iconColor} />