diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index f29b35aa5..0d5d18d1e 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -122,10 +122,10 @@ var gZenMarketplaceManager = {
             fragment.querySelector(".zenThemeMarketplaceItemPreferenceCheckbox").setAttribute("checked", "true");
           }
           fragment.querySelector(".zenThemeMarketplaceItemPreferenceCheckbox").addEventListener("click", (event) => {
-            let target = event.target;
+            let target = event.target.closest(".zenThemeMarketplaceItemPreferenceCheckbox");
             let key = target.getAttribute("zen-pref");
             let checked = target.hasAttribute("checked");
-            if (checked) {
+            if (!checked) {
               target.removeAttribute("checked");
             } else {
               target.setAttribute("checked", "true");
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index dd0e790cd..5ee3dc57b 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -304,7 +304,7 @@ groupbox h2 {
 .zenThemeMarketplaceItem {
   width: 100%;
 
-  &:not(:first-of-type) {
+  &:not(:first-of-type), .zenThemeMarketplaceItemPreferences {
     margin-top: 15px;
   }
 }