diff --git a/app/views/admin/dns/zones/_zone.html.erb b/app/views/admin/dns/zones/_zone.html.erb
index 3a2d782d4..5f13fdf3a 100644
--- a/app/views/admin/dns/zones/_zone.html.erb
+++ b/app/views/admin/dns/zones/_zone.html.erb
@@ -1,7 +1,6 @@
 <tr>
-    <td><%= zone.origin %></td>
+    <td><%= link_to zone.origin, edit_admin_zone_path(zone), id: 'admin-edit-zone-btn' %></td>
     <td>
-        <%= link_to t('.edit_btn'), edit_admin_zone_path(zone), class: 'btn btn-xs btn-primary' %>
         <%= link_to t('.generate_zone_file_btn'),
                     admin_zonefiles_path(origin: zone.origin),
                     method: 'post', class: 'btn btn-xs btn-primary' %>
diff --git a/config/locales/admin/dns/zones.en.yml b/config/locales/admin/dns/zones.en.yml
index c6fd4093b..08897a93b 100644
--- a/config/locales/admin/dns/zones.en.yml
+++ b/config/locales/admin/dns/zones.en.yml
@@ -29,5 +29,4 @@ en:
           update_btn: Update zone
 
         zone:
-          edit_btn: Edit
           generate_zone_file_btn: Generate zone file
diff --git a/spec/features/admin/dns/zones/edit_spec.rb b/spec/features/admin/dns/zones/edit_spec.rb
index caf3fcfc2..d21f358ec 100644
--- a/spec/features/admin/dns/zones/edit_spec.rb
+++ b/spec/features/admin/dns/zones/edit_spec.rb
@@ -8,7 +8,7 @@ RSpec.feature 'Editing zone in admin area', settings: false do
   end
 
   scenario 'updates zone' do
-    open_list
+    visit admin_zones_url
     open_form
     submit_form
 
@@ -20,7 +20,7 @@ RSpec.feature 'Editing zone in admin area', settings: false do
   end
 
   def open_form
-    click_link_or_button t('admin.dns.zones.zone.edit_btn')
+    click_link_or_button 'admin-edit-zone-btn'
   end
 
   def submit_form