diff --git a/src/js/popups/custom-background-filter.js b/src/js/popups/custom-background-filter.js
index 0d23059fe..5c7dae02c 100644
--- a/src/js/popups/custom-background-filter.js
+++ b/src/js/popups/custom-background-filter.js
@@ -39,37 +39,51 @@ export function apply() {
 }
 
 function syncSliders() {
-  $(".blur").val(filters["blur"].value);
-  $(".brightness").val(filters["brightness"].value);
-  $(".saturate").val(filters["saturate"].value);
-  $(".opacity").val(filters["opacity"].value);
+  $(".section.customBackgroundFilter .blur input").val(filters["blur"].value);
+  $(".section.customBackgroundFilter .brightness input").val(
+    filters["brightness"].value
+  );
+  $(".section.customBackgroundFilter .saturate input").val(
+    filters["saturate"].value
+  );
+  $(".section.customBackgroundFilter .opacity input").val(
+    filters["opacity"].value
+  );
 }
 
-$(".blur").on("input", (e) => {
-  filters["blur"].value = $(".blur").val();
+$(".section.customBackgroundFilter .blur input").on("input", (e) => {
+  filters["blur"].value = $(
+    ".section.customBackgroundFilter .blur input"
+  ).val();
   updateNumbers();
   apply();
 });
 
-$(".brightness").on("input", (e) => {
-  filters["brightness"].value = $(".brightness").val();
+$(".section.customBackgroundFilter .brightness input").on("input", (e) => {
+  filters["brightness"].value = $(
+    ".section.customBackgroundFilter .brightness input"
+  ).val();
   updateNumbers();
   apply();
 });
 
-$(".saturate").on("input", (e) => {
-  filters["saturate"].value = $(".saturate").val();
+$(".section.customBackgroundFilter .saturate input").on("input", (e) => {
+  filters["saturate"].value = $(
+    ".section.customBackgroundFilter .saturate input"
+  ).val();
   updateNumbers();
   apply();
 });
 
-$(".opacity").on("input", (e) => {
-  filters["opacity"].value = $(".opacity").val();
+$(".section.customBackgroundFilter .opacity input").on("input", (e) => {
+  filters["opacity"].value = $(
+    ".section.customBackgroundFilter .opacity input"
+  ).val();
   updateNumbers();
   apply();
 });
 
-$(".customBackgroundFilter .button").click((e) => {
+$(".section.customBackgroundFilter  .save.button").click((e) => {
   let arr = [];
   Object.keys(filters).forEach((filterKey) => {
     arr.push(filters[filterKey].value);
@@ -87,8 +101,16 @@ export function loadConfig(config) {
 }
 
 function updateNumbers() {
-  $(".blurValue").html(parseFloat(filters.blur.value).toFixed(1));
-  $(".brightnessValue").html(parseFloat(filters.brightness.value).toFixed(1));
-  $(".saturateValue").html(parseFloat(filters.saturate.value).toFixed(1));
-  $(".opacityValue").html(parseFloat(filters.opacity.value).toFixed(1));
+  $(".section.customBackgroundFilter .blur .value").html(
+    parseFloat(filters.blur.value).toFixed(1)
+  );
+  $(".section.customBackgroundFilter .brightness .value").html(
+    parseFloat(filters.brightness.value).toFixed(1)
+  );
+  $(".section.customBackgroundFilter .saturate .value").html(
+    parseFloat(filters.saturate.value).toFixed(1)
+  );
+  $(".section.customBackgroundFilter .opacity .value").html(
+    parseFloat(filters.opacity.value).toFixed(1)
+  );
 }
diff --git a/static/index.html b/static/index.html
index b5d8700ce..7cc4eb163 100644
--- a/static/index.html
+++ b/static/index.html
@@ -2979,56 +2979,54 @@
                 </div>
                 <div class="tabs">
                   <div class="groups">
-                    <div class="group">
+                    <div class="group blur">
                       <div class="title">blur</div>
-                      <div class="blurValue"></div>
+                      <div class="value"></div>
                       <input
                         type="range"
                         min="0"
                         max="5"
                         value="0"
                         step="0.1"
-                        class="blur"
                       />
                     </div>
-                    <div class="group">
+                    <div class="group brightness">
                       <div class="title">brightness</div>
-                      <div class="brightnessValue"></div>
+                      <div class="value"></div>
                       <input
                         type="range"
                         min="0"
                         max="2"
                         value="1"
                         step="0.1"
-                        class="brightness"
                       />
                     </div>
-                    <div class="group">
+                    <div class="group saturate">
                       <div class="title">saturate</div>
-                      <div class="saturateValue"></div>
+                      <div class="value"></div>
                       <input
                         type="range"
                         min="0"
                         max="2"
                         value="1"
                         step="0.1"
-                        class="saturate"
                       />
                     </div>
-                    <div class="group">
+                    <div class="group opacity">
                       <div class="title">opacity</div>
-                      <div class="opacityValue"></div>
+                      <div class="value"></div>
                       <input
                         type="range"
                         min="0"
                         max="1"
                         value="1"
                         step="0.1"
-                        class="opacity"
                       />
                     </div>
                   </div>
-                  <div class="button"><i class="fas fa-save fa-fw"></i></div>
+                  <div class="save button">
+                    <i class="fas fa-save fa-fw"></i>
+                  </div>
                 </div>
               </div>
               <div class="section themes">