diff --git a/app/components/DS/menu.rb b/app/components/DS/menu.rb
index afc9049f..39ef35e9 100644
--- a/app/components/DS/menu.rb
+++ b/app/components/DS/menu.rb
@@ -4,7 +4,7 @@ class DS::Menu < DesignSystemComponent
   attr_reader :variant, :avatar_url, :initials, :placement, :offset, :icon_vertical, :no_padding, :testid
 
   renders_one :button, ->(**button_options, &block) do
-    options_with_target = button_options.merge(data: { menu_target: "button" })
+    options_with_target = button_options.merge(data: { DS__menu_target: "button" })
 
     if block
       content_tag(:button, **options_with_target, &block)
diff --git a/app/views/transactions/searches/_form.html.erb b/app/views/transactions/searches/_form.html.erb
index 1826c123..d11fe5cf 100644
--- a/app/views/transactions/searches/_form.html.erb
+++ b/app/views/transactions/searches/_form.html.erb
@@ -23,8 +23,7 @@
         type: "button",
         text: "Filter",
         variant: "outline",
-        icon: "list-filter",
-        data: { menu_target: "button" }
+        icon: "list-filter"
       ) %>
 
       <% menu.with_custom_content do %>
diff --git a/app/views/transactions/searches/_menu.html.erb b/app/views/transactions/searches/_menu.html.erb
index 00ea5a46..0f2e9b09 100644
--- a/app/views/transactions/searches/_menu.html.erb
+++ b/app/views/transactions/searches/_menu.html.erb
@@ -37,7 +37,7 @@
         </div>
 
         <div>
-          <%= render DS::Button.new(text: t(".cancel"), type: "button", variant: "ghost", data: { action: "menu#close" }) %>
+          <%= render DS::Button.new(text: t(".cancel"), type: "button", variant: "ghost", data: { action: "DS--menu#close" }) %>
           <%= render DS::Button.new(text: t(".apply")) %>
         </div>
       </div>
diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rb
index e910a3ac..da1b5938 100644
--- a/test/system/accounts_test.rb
+++ b/test/system/accounts_test.rb
@@ -98,7 +98,7 @@ class AccountsTest < ApplicationSystemTestCase
   private
 
     def open_new_account_modal
-      within "[data-controller='tabs']" do
+      within "[data-controller='DS--tabs']" do
         click_button "All"
         click_link "New account"
       end