diff --git a/app/overrides/replace_delivery_addres.rb b/app/overrides/replace_delivery_addres.rb
index 4595efabad..362e217bc0 100644
--- a/app/overrides/replace_delivery_addres.rb
+++ b/app/overrides/replace_delivery_addres.rb
@@ -1,4 +1,5 @@
 Deface::Override.new(:virtual_path  => "spree/checkout/_address",
             :replace       => "[data-hook='shipping_fieldset_wrapper']",
             :partial       => "spree/checkout/distributor",
-            :name          => "drop_off_point")
\ No newline at end of file
+            :name          => "drop_off_point")
+
diff --git a/app/views/spree/checkout/_address.html.erb b/app/views/spree/checkout/_address.html.erb
index 9a5808ee61..77c035150e 100644
--- a/app/views/spree/checkout/_address.html.erb
+++ b/app/views/spree/checkout/_address.html.erb
@@ -44,9 +44,6 @@
         <p class="field" id="bstate">
           <% have_states = !@order.bill_address.country.states.empty? %>
           <%= bill_form.label :state, t(:state) %><span class="req">*</span><br />
-          <noscript>
-            <%= bill_form.text_field :state_name, :class => 'required' %>
-          </noscript>
           <% state_elements = [
              bill_form.collection_select(:state_id, @order.bill_address.country.states,
                                 :id, :name,
@@ -62,6 +59,9 @@
             document.write("<%== state_elements %>");
           <% end -%>
         </p>
+        <noscript>
+          <%= bill_form.text_field :state_name, :class => 'required' %>
+        </noscript>
       <% end %>
 
       <p class="field" id="bzipcode">
@@ -131,9 +131,6 @@
         <p class="field" id="sstate">
           <% have_states = !@order.ship_address.country.states.empty? %>
           <%= ship_form.label :state, t(:state) %><span class="req">*</span><br />
-          <noscript>
-            <%= ship_form.text_field :state_name, :class => 'required' %>
-          </noscript>
           <% state_elements = [
              ship_form.collection_select(:state_id, @order.ship_address.country.states,
                                 :id, :name,
@@ -149,6 +146,9 @@
             document.write("<%== state_elements %>");
           <% end %>
         </p>
+        <noscript>
+          <%= ship_form.text_field :state_name, :class => 'required' %>
+        </noscript>
       <% end %>
 
       <p class="field" id="szipcode">