diff --git a/app/components/admin/settings/featured_settings_form_component.html.erb b/app/components/admin/settings/featured_settings_form_component.html.erb
index e1b8840c9..fb73a042b 100644
--- a/app/components/admin/settings/featured_settings_form_component.html.erb
+++ b/app/components/admin/settings/featured_settings_form_component.html.erb
@@ -1,5 +1,5 @@
 <%= form_for([:admin, feature], remote: remote?, html: { class: "featured-settings-form" }) do |f| %>
-  <%= f.hidden_field :tab, id: dom_id(feature, :tab), value: tab if tab %>
+  <%= hidden_field_tag :tab, tab if tab %>
   <%= f.hidden_field :describedby, id: dom_id(feature, :describedby), value: describedby if describedby %>
   <%= f.hidden_field :value, id: dom_id(feature, :value), value: (enabled? ? "" : "active") %>
   <%= f.button text, options %>
diff --git a/app/components/admin/settings/text_form_component.html.erb b/app/components/admin/settings/text_form_component.html.erb
index 70b11d291..63117e49f 100644
--- a/app/components/admin/settings/text_form_component.html.erb
+++ b/app/components/admin/settings/text_form_component.html.erb
@@ -1,5 +1,5 @@
 <%= form_for([:admin, setting]) do |f| %>
-  <%= f.hidden_field :tab, id: dom_id(setting, :tab), value: tab if tab %>
+  <%= hidden_field_tag :tab, tab if tab %>
   <div class="small-12 medium-6 large-8 column">
     <%= f.text_area :value,
                     label: false,
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 3e8c023ca..d9a2d6690 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -55,8 +55,6 @@ class Admin::SettingsController < Admin::BaseController
     end
 
     def request_referer
-      return request.referer + params[:setting][:tab] if params[:setting][:tab]
-
-      request.referer
+      request.referer + params[:tab].to_s
     end
 end
diff --git a/app/views/admin/settings/update.js.erb b/app/views/admin/settings/update.js.erb
index a18526d08..57d75bc95 100644
--- a/app/views/admin/settings/update.js.erb
+++ b/app/views/admin/settings/update.js.erb
@@ -1,6 +1,6 @@
 var form = $("<%= j render Admin::Settings::FeaturedSettingsFormComponent.new(
   @setting,
-  tab: params[:setting][:tab],
+  tab: params[:tab],
   describedby: params[:setting][:describedby]
 ) %>");