diff --git a/app/assets/stylesheets/sdg/goals/targets.scss b/app/assets/stylesheets/sdg/goals/targets.scss
index f4b061462..ec9fb307c 100644
--- a/app/assets/stylesheets/sdg/goals/targets.scss
+++ b/app/assets/stylesheets/sdg/goals/targets.scss
@@ -1,4 +1,4 @@
-.sdg-goal-show .targets {
+.sdg-goal-targets {
   dt,
   dd {
     display: inline;
diff --git a/app/components/sdg/goals/targets_component.html.erb b/app/components/sdg/goals/targets_component.html.erb
index d6030e8c6..7fa66cad8 100644
--- a/app/components/sdg/goals/targets_component.html.erb
+++ b/app/components/sdg/goals/targets_component.html.erb
@@ -1,15 +1,15 @@
-<section class="targets">
-  <ul class="tabs" id="target_tabs" data-deep-link="true" data-tabs>
+<section class="sdg-goal-targets">
+  <ul class="tabs" id="goal_<%= goal.code %>_targets" data-deep-link="true" data-tabs>
     <% [global_targets, local_targets].each do |targets| %>
       <li class="tabs-title <%= active(targets) %>">
-        <%= link_to title(targets), "#tab_#{type(targets)}_targets" %>
+        <%= link_to title(targets), "#goal_#{@goal.code}_tab_#{type(targets)}_targets" %>
       </li>
     <% end %>
   </ul>
 
-  <div class="tabs-content" data-tabs-content="target_tabs">
+  <div class="tabs-content" data-tabs-content="goal_<%= goal.code %>_targets">
     <% [global_targets, local_targets].each do |targets| %>
-      <div class="tabs-panel <%= active(targets) %>" id="tab_<%= type(targets) %>_targets">
+      <div class="tabs-panel <%= active(targets) %>" id="goal_<%= goal.code %>_tab_<%= type(targets) %>_targets">
         <% if targets.blank? %>
           <div class="callout primary">
             <%= t("sdg.goals.show.targets.no_local_targets") %>
diff --git a/spec/components/sdg/goals/targets_component_spec.rb b/spec/components/sdg/goals/targets_component_spec.rb
index b172c0acb..a7c1bbed7 100644
--- a/spec/components/sdg/goals/targets_component_spec.rb
+++ b/spec/components/sdg/goals/targets_component_spec.rb
@@ -21,13 +21,13 @@ describe SDG::Goals::TargetsComponent, type: :component do
   it "renders tabs panel" do
     render_inline component
 
-    expect(page).to have_css ".targets"
-    expect(page).to have_css "#target_tabs"
+    expect(page).to have_css ".sdg-goal-targets"
+    expect(page).to have_css "#goal_1_targets"
     expect(page).to have_css "li", count: 2
     expect(page).to have_content "Targets"
     expect(page).to have_content "Local targets"
     expect(page).to have_css ".tabs-content"
-    expect(page).to have_css "#tab_global_targets"
+    expect(page).to have_css "#goal_1_tab_global_targets"
   end
 
   it "renders code and title for each target" do
diff --git a/spec/system/sdg/goals_spec.rb b/spec/system/sdg/goals_spec.rb
index edf0f7e6b..b2e737172 100644
--- a/spec/system/sdg/goals_spec.rb
+++ b/spec/system/sdg/goals_spec.rb
@@ -122,7 +122,7 @@ describe "SDG Goals", :js do
       create(:sdg_local_target, code: "15.1.1", title: "SDG local target sample text")
       visit sdg_goal_path(15)
 
-      within "#target_tabs" do
+      within ".sdg-goal-targets" do
         expect(page).to have_content "Targets"
         expect(page).to have_content "Local targets"
       end