diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index 6ffe7b4c24f85de3cf3948b3078e6b2858e0658d..110c24ac9e41a8de90ea6bb691ce38e3cff70c56 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new_protected_tag' } do |f|
   .panel.panel-default
     .panel-heading
       %h3.panel-title
@@ -26,7 +26,7 @@
               = dropdown_tag('Select',
                              options: { toggle_class: 'js-allowed-to-push wide',
                              dropdown_class: 'dropdown-menu-selectable',
-                             data: { field_name: 'protected_branch[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
+                             data: { field_name: 'protected_tag[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
 
     .panel-footer
       = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/protected_tags/_dropdown.html.haml b/app/views/projects/protected_tags/_dropdown.html.haml
index 3da153bc5217b429170e897666458b9b1eb9769d..748515190779f13960615bafc97dc4e147b2dea9 100644
--- a/app/views/projects/protected_tags/_dropdown.html.haml
+++ b/app/views/projects/protected_tags/_dropdown.html.haml
@@ -5,7 +5,7 @@
                           filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search protected tag",
                           footer_content: true,
                           data: { show_no: true, show_any: true, show_upcoming: true,
-                                  selected: params[:protected_branch_name],
+                                  selected: params[:protected_tag_name],
                                   project_id: @project.try(:id) } }) do
 
   %ul.dropdown-footer-list
diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
index 3a1da1202e9fd6e1b4c0b93335ce8d63e1ede3ee..0965bf75eae39ed821f72a6a875313f2af05b34a 100644
--- a/app/views/projects/protected_tags/_index.html.haml
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('protected_branches')
+  = page_specific_javascript_bundle_tag('protected_tags')
 
 .row.prepend-top-default.append-bottom-default
   .col-lg-3