diff --git a/app/views/spree/admin/shared/_order_tabs.html.haml b/app/views/spree/admin/shared/_order_tabs.html.haml
index af04fe676e..d250507193 100644
--- a/app/views/spree/admin/shared/_order_tabs.html.haml
+++ b/app/views/spree/admin/shared/_order_tabs.html.haml
@@ -17,8 +17,9 @@
       %dt#order_status
         = t(:status)
       %dd
-        %span{:class => "state #{@order.state}"}
-        = t(@order.state, scope: :order_state)
+        - order_state_classes = "state #{@order.state}"
+        %span{ class: order_state_classes }
+          = t(@order.state, scope: :order_state)
       %dt
         = t(:total)
         \:
@@ -30,13 +31,15 @@
           = t(:shipment)
           \:
         %dd#shipment_status
-          %span{class: "state #{@order.shipment_state}"}
+          - shipment_state_classes = "state #{@order.shipment_state}"
+          %span{ class: shipment_state_classes }
             = t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"])
         %dt
           = t(:payment)
           \:
         %dd#payment_status
-          %span{class: "state #{@order.payment_state}"}
+          - payment_state_classes = "state #{@order.payment_state}"
+          %span{ class: payment_state_classes }
             = t(@order.payment_state, scope: :payment_states, default: [:missing, "none"])
         %dt
           = t(:date_completed)
@@ -46,18 +49,27 @@
 
   %nav.menu
     %ul
-      %li{ class: "#{'active' if true}" }
+      - order_details_classes = "active" if current == "Order Details"
+      %li{ class: order_details_classes }
       = link_to_with_icon 'icon-edit', t(:order_details), edit_admin_order_url(@order)
-      %li{"#{'class=active' if current == 'Customer Details'}"}
+
+      - customer_details_classes = "active" if current == "Customer Details"
+      %li{ class: customer_details_classes }
       = link_to_with_icon 'icon-user', t(:customer_details), admin_order_customer_url(@order)
-      %li{"#{'class=active' if current == 'Adjustments Details'}"}
+
+      - adjustments_classes = "active" if current == "Adjustments"
+      %li{ class: adjustments_classes }
       = link_to_with_icon 'icon-cogs', t(:adjustments), admin_order_adjustments_url(@order)
 
-      %li{"#{'class=active' if current == 'Payments'}"}
+      - payments_classes = "active" if current == "Payments"
+      %li{ class: payments_classes }
       = link_to_with_icon 'icon-credit-card', t(:payments), admin_order_payments_url(@order)
 
-      %li{"#{'class=active' if current == 'Shipments'}"}
+      - shipments_classes = "active" if current == "Shipments"
+      %li{ class: shipments_classes }
       = link_to_with_icon 'icon-road', t(:shipments), admin_order_shipments_url(@order)
+
       - if @order.completed?
-        %li{"#{'class=active' if current == 'Return Authorizations'}"}
+        - authorizations_classes = "active" if current == "Return Authorizations"
+        %li{ class: authorizations_classes }
         = link_to_with_icon 'icon-share-alt', t(:return_authorizations), admin_order_return_authorizations_url(@order)