diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
index 682aedddcb..994b9d5bc7 100644
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -161,7 +161,7 @@ def scope
 
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id, :channel)
+        params.permit(:created_by_id, :user_id, :store_id, :channel_id)
       end
 
       def load_order
diff --git a/app/views/spree/admin/orders/_channel_form.html.erb b/app/views/spree/admin/orders/_channel_form.html.erb
index 24f9aa510f..0a6b46c246 100644
--- a/app/views/spree/admin/orders/_channel_form.html.erb
+++ b/app/views/spree/admin/orders/_channel_form.html.erb
@@ -1,18 +1,16 @@
 <div data-hook="channel-form-container">
-  <%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
+  <%= form_tag set_channel_admin_order_url, method: :put do %>
     <fieldset>
-    <div data-hook="admin_order_channel_field">
-      <%= f.field_container :channel do %>
-        <%= f.label :channel, Spree.t(:channel) %>
-        <%= f.text_field :channel, name: 'channel', class: 'form-control' %>
-        <%= f.error_message_on :channel %>
-      <% end %>
-    </div>
-    <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
-      <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'cancel.svg' %>
-    </div>
+      <div data-hook="admin_order_channel_field">
+        <%= label_tag :channel_id, Spree.t(:channel) %>
+        <%= select_tag :channel_id, options_for_select(order.store.store_channels.pluck(:name, :id), order.channel_id), include_blank: true, class: 'select2-clear' %>
+      </div>
+      <br/>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'cancel.svg' %>
+      </div>
     <fieldset>
   <% end %>
 </div>