From 50342e945d2184213a0ed4c3d9f456826604a1e3 Mon Sep 17 00:00:00 2001
From: Samuel Oldham <77629938+SO9010@users.noreply.github.com>
Date: Mon, 12 May 2025 15:35:49 +0100
Subject: [PATCH 1/2] Add fix for #7810

Signed-off-by: Samuel Oldham <77629938+SO9010@users.noreply.github.com>
---
 src/browser/components/preferences/zen-settings.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index bd5385f52..17a12fef1 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -981,8 +981,11 @@ var gZenCKSSettings = {
             sibling.remove();
           }
         }
+        if (target.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`)) {
+          target.label = 'Not set';
+        }
       });
-
+      
       const groupElem = wrapper.querySelector(`[data-group="${ZEN_CKS_GROUP_PREFIX}-${group}"]`);
       groupElem.after(fragment);
     }
@@ -1038,6 +1041,7 @@ var gZenCKSSettings = {
     shortcut = shortcut.replace(/Ctrl|Control|Shift|Alt|Option|Cmd|Meta/, ''); // Remove all modifiers
 
     if (shortcut == 'Tab' && !modifiersActive) {
+      input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
       input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
       this._latestValidKey = null;
       return;
@@ -1065,6 +1069,9 @@ var gZenCKSSettings = {
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
 
         this._editDone(this._latestValidKey, this._latestModifier);
+        if (this.name == 'Not set') {
+          input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
+        } 
         this._latestValidKey = null;
         this._latestModifier = null;
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
@@ -1086,6 +1093,10 @@ var gZenCKSSettings = {
       this._latestValidKey = null;
       this._latestModifier = null;
       this._hasSafed = true;
+      const sibling = input.nextElementSibling;
+      if (sibling && sibling.classList.contains(`${ZEN_CKS_CLASS_BASE}-conflict`)) {
+        sibling.remove();
+      }
       return;
     }
 

From 9bec7a88fe30a9f8c5c42ef64adff3feb0aa20b1 Mon Sep 17 00:00:00 2001
From: Samuel Oldham <77629938+SO9010@users.noreply.github.com>
Date: Mon, 12 May 2025 15:53:21 +0100
Subject: [PATCH 2/2] Lint

Signed-off-by: Samuel Oldham <77629938+SO9010@users.noreply.github.com>
---
 src/browser/components/preferences/zen-settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 17a12fef1..a252ac3fb 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -985,7 +985,7 @@ var gZenCKSSettings = {
           target.label = 'Not set';
         }
       });
-      
+
       const groupElem = wrapper.querySelector(`[data-group="${ZEN_CKS_GROUP_PREFIX}-${group}"]`);
       groupElem.after(fragment);
     }
@@ -1071,7 +1071,7 @@ var gZenCKSSettings = {
         this._editDone(this._latestValidKey, this._latestModifier);
         if (this.name == 'Not set') {
           input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
-        } 
+        }
         this._latestValidKey = null;
         this._latestModifier = null;
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);