diff --git a/app/components/form/multiple_select_component.html.erb b/app/components/form/multiple_select_component.html.erb
index 08851cea08..abd03c3197 100644
--- a/app/components/form/multiple_select_component.html.erb
+++ b/app/components/form/multiple_select_component.html.erb
@@ -25,8 +25,8 @@
       <div class="d-none"></div>
     </template>
 
-    <template data-multiple-select-target="showAllOption">
-      <div class="fug d-flex align-items-baseline show-all-options" data-multiple-select-target="showAllOption" data-action="multiple-select#toggleSelectAll">
+    <template data-multiple-select-target="selectAllOption">
+      <div class="d-flex align-items-baseline">
         <span class='mr-5'>DATA_LABEL</span>
       </div>
     </template>
diff --git a/app/javascript/controllers/multiple_select_controller.js b/app/javascript/controllers/multiple_select_controller.js
index 6add7f495e..845c1805a3 100644
--- a/app/javascript/controllers/multiple_select_controller.js
+++ b/app/javascript/controllers/multiple_select_controller.js
@@ -2,7 +2,7 @@ import { Controller } from '@hotwired/stimulus'
 import TomSelect from 'tom-select'
 
 export default class extends Controller {
-  static targets = ['select', 'option', 'item', 'hiddenItem', 'showAllOption']
+  static targets = ['select', 'option', 'item', 'hiddenItem', 'selectAllOption']
   static values = {
     options: Array,
     selectedItems: Array,
@@ -40,7 +40,7 @@ export default class extends Controller {
 
     const showAllOptionCheck = this.showAllOptionValue
     const hiddenItemTemplate = showAllOptionCheck && this.hiddenItemTarget && this.hiddenItemTarget.innerHTML
-    const showAllOptionTemplate = showAllOptionCheck && this.showAllOptionTarget && this.showAllOptionTarget.innerHTML
+    const showAllOptionTemplate = showAllOptionCheck && this.selectAllOptionTarget && this.selectAllOptionTarget.innerHTML
 
     // orderedOptionVals is of type (" " | number)[] - the " " could appear
     // because using it as the value for the select/unselect all option