diff --git a/backend/app/views/spree/admin/shipping_methods/_form.html.erb b/backend/app/views/spree/admin/shipping_methods/_form.html.erb
index 7e2f07ccc7e..677fb613bc6 100644
--- a/backend/app/views/spree/admin/shipping_methods/_form.html.erb
+++ b/backend/app/views/spree/admin/shipping_methods/_form.html.erb
@@ -54,6 +54,32 @@
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
   </div>
+
+  <div class="col-5">
+    <%= f.field_container :stock_locations do %>
+      <%= f.label :stock_locations %>
+      <%= f.collection_select :stock_location_ids,
+        Spree::StockLocation.order_default, :id, :name,
+        {},
+        class: 'fullwidth select2',
+        multiple: true %>
+      <%= error_message_on :shipping_method, :stock_locations %>
+    <% end %>
+  </div>
+
+  <div class="col-5">
+    <%= f.field_container :available_to_all, class: %w(checkbox) do %>
+      <label>
+        <%= f.check_box(:available_to_all) %>
+        <%= Spree::ShippingMethod.human_attribute_name :available_to_all %>
+        <span class="hint-tooltip"
+              data-content="<%= t('spree.admin.shipping_methods.form.available_to_all_hint') %>">
+          <i class="fa fa-info-circle"></i>
+        </span>
+      </label>
+      <%= error_message_on :shipping_method, :available_to_all %>
+    <% end %>
+  </div>
 </div>
 
 <%= f.field_container :available_to_users, class: %w(checkbox) do %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 281b4c7668b..2d9cc8c9735 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -319,6 +319,8 @@ en:
         name: Name
         service_level: Service Level
         tracking_url: Tracking URL
+        stock_locations: Stock Locations
+        available_to_all: Available to all stock locations
       spree/shipping_rate:
         amount: Amount
         label: Label
@@ -883,6 +885,11 @@ en:
         expired: Expired
         inactive: Inactive
         not_started: Not started
+      shipping_methods:
+        form:
+          available_to_all_hint: When checked, this shipping method will be
+            available to all stock locations ignoring the selected values in
+            "Stock Locations" field.
       stock_locations:
         form:
           address: Address