diff --git a/app/views/spree/admin/adjustments/edit.html.haml b/app/views/spree/admin/adjustments/edit.html.haml
index c31dfb145e..756288c4f4 100644
--- a/app/views/spree/admin/adjustments/edit.html.haml
+++ b/app/views/spree/admin/adjustments/edit.html.haml
@@ -1,4 +1,5 @@
-= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
+= render :partial => 'spree/admin/shared/order_page_title'
+= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }
 
 - content_for :page_title do
   %i.icon-arrow-right
diff --git a/app/views/spree/admin/adjustments/index.html.haml b/app/views/spree/admin/adjustments/index.html.haml
index 7268441e1e..02433a6e5c 100644
--- a/app/views/spree/admin/adjustments/index.html.haml
+++ b/app/views/spree/admin/adjustments/index.html.haml
@@ -1,4 +1,5 @@
-= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
+= render partial: 'spree/admin/shared/order_page_title'
+= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }
 
 - content_for :page_title do
   %i.icon-arrow-right
diff --git a/app/views/spree/admin/adjustments/new.html.haml b/app/views/spree/admin/adjustments/new.html.haml
index 3eb6f5c58e..2af33aae54 100644
--- a/app/views/spree/admin/adjustments/new.html.haml
+++ b/app/views/spree/admin/adjustments/new.html.haml
@@ -1,4 +1,5 @@
-= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
+= render partial: 'spree/admin/shared/order_page_title'
+= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }
 
 - content_for :page_title do
   %i.icon-arrow-right
diff --git a/app/views/spree/admin/orders/customer_details/edit.html.haml b/app/views/spree/admin/orders/customer_details/edit.html.haml
index e4fa93ffbb..7c6118cac6 100644
--- a/app/views/spree/admin/orders/customer_details/edit.html.haml
+++ b/app/views/spree/admin/orders/customer_details/edit.html.haml
@@ -1,4 +1,5 @@
-= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' }
+= render partial: 'spree/admin/shared/order_page_title'
+= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' }
 
 = csrf_meta_tags
 
diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml
index 69abbe8f38..d2047e6bf4 100644
--- a/app/views/spree/admin/orders/edit.html.haml
+++ b/app/views/spree/admin/orders/edit.html.haml
@@ -8,7 +8,8 @@
   - if can?(:admin, Spree::Order)
     %li= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
 
-= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' }
+= render partial: "spree/admin/shared/order_page_title"
+= render partial: "spree/admin/shared/order_tabs", locals: { current: 'Order Details' }
 
 %div{"data-hook" => "admin_order_edit_header"}
   -# Suppress errors when manually creating a new order - needs to proceed to edit page
diff --git a/app/views/spree/admin/orders/new.html.haml b/app/views/spree/admin/orders/new.html.haml
index 9ec198b2d7..556e464cd4 100644
--- a/app/views/spree/admin/orders/new.html.haml
+++ b/app/views/spree/admin/orders/new.html.haml
@@ -1,5 +1,7 @@
 - content_for :page_title do
-  = t(:new)
+  = t(:new_order)
+  \#
+  = @order.number
 
 - content_for :page_actions do
   %li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'
diff --git a/app/views/spree/admin/orders/set_distribution.html.haml b/app/views/spree/admin/orders/set_distribution.html.haml
index f5e259321e..3579619185 100644
--- a/app/views/spree/admin/orders/set_distribution.html.haml
+++ b/app/views/spree/admin/orders/set_distribution.html.haml
@@ -1,12 +1,14 @@
-- content_for :page_title do
-  = t(:new)
-
 - content_for :page_actions do
   %li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'
 
 = admin_inject_shops(module: 'admin.orders')
 = admin_inject_order_cycles
 
+- content_for :page_title do
+  = t(:new_order)
+  \#
+  = @order.number
+
 = render 'spree/admin/shared/order_tabs', :current => 'Order Details'
 
 = csrf_meta_tags
diff --git a/app/views/spree/admin/payments/index.html.haml b/app/views/spree/admin/payments/index.html.haml
index 3c62b54843..7fbe76429f 100644
--- a/app/views/spree/admin/payments/index.html.haml
+++ b/app/views/spree/admin/payments/index.html.haml
@@ -1,3 +1,4 @@
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }
 
 - content_for :page_actions do
diff --git a/app/views/spree/admin/payments/new.html.haml b/app/views/spree/admin/payments/new.html.haml
index 7c825051ad..710456cc2d 100644
--- a/app/views/spree/admin/payments/new.html.haml
+++ b/app/views/spree/admin/payments/new.html.haml
@@ -1,3 +1,4 @@
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/payments/show.html.haml b/app/views/spree/admin/payments/show.html.haml
index 97850cb19a..acbc2d8aaf 100644
--- a/app/views/spree/admin/payments/show.html.haml
+++ b/app/views/spree/admin/payments/show.html.haml
@@ -1,3 +1,4 @@
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/return_authorizations/edit.html.haml b/app/views/spree/admin/return_authorizations/edit.html.haml
index 2847c10965..9f5429640d 100644
--- a/app/views/spree/admin/return_authorizations/edit.html.haml
+++ b/app/views/spree/admin/return_authorizations/edit.html.haml
@@ -6,6 +6,7 @@
     - if @return_authorization.can_cancel?
       = button_link_to t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: t('.are_you_sure') }, icon: 'icon-remove'
 
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/return_authorizations/index.html.haml b/app/views/spree/admin/return_authorizations/index.html.haml
index acf016b50d..bc8ed9dd80 100644
--- a/app/views/spree/admin/return_authorizations/index.html.haml
+++ b/app/views/spree/admin/return_authorizations/index.html.haml
@@ -1,3 +1,4 @@
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }
 
 - content_for :page_actions do
diff --git a/app/views/spree/admin/return_authorizations/new.html.haml b/app/views/spree/admin/return_authorizations/new.html.haml
index 54573f7392..5594288cf3 100644
--- a/app/views/spree/admin/return_authorizations/new.html.haml
+++ b/app/views/spree/admin/return_authorizations/new.html.haml
@@ -1,3 +1,4 @@
+= render partial: 'spree/admin/shared/order_page_title'
 = render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/shared/_order_page_title.html.haml b/app/views/spree/admin/shared/_order_page_title.html.haml
new file mode 100644
index 0000000000..927062d4f7
--- /dev/null
+++ b/app/views/spree/admin/shared/_order_page_title.html.haml
@@ -0,0 +1,4 @@
+- content_for :page_title do
+  = t(:order)
+  \#
+  = @order.number
diff --git a/app/views/spree/admin/shared/_order_tabs.html.haml b/app/views/spree/admin/shared/_order_tabs.html.haml
index 89d7299fdc..f96a5dd140 100644
--- a/app/views/spree/admin/shared/_order_tabs.html.haml
+++ b/app/views/spree/admin/shared/_order_tabs.html.haml
@@ -1,8 +1,3 @@
-- content_for :page_title do
-  = t(:order)
-  \#
-  = @order.number
-
 - if @order.bill_address.present?
   = @order.bill_address.firstname
   = @order.bill_address.lastname