diff --git a/commerce_checkout_progress.module b/commerce_checkout_progress.module
index 6f2155e..54aae61 100644
--- a/commerce_checkout_progress.module
+++ b/commerce_checkout_progress.module
@@ -153,15 +153,14 @@ function theme_commerce_checkout_progress_list($variables) {
 
   // Option to display back pages as links.
   if ($link) {
+    // If we are on the checkout page, load the order from the arguments.
+    if (arg(0) == 'checkout' && $order_id = arg(1)) {
+      $order = commerce_order_load($order_id);
+    }
     // Load the *shopping cart* order. It gets deleted on last page.
-    if (module_exists('commerce_cart') && $order = commerce_cart_order_load($GLOBALS['user']->uid)) {
+    elseif (module_exists('commerce_cart') && $order = commerce_cart_order_load($GLOBALS['user']->uid)) {
       $order_id = $order->order_id;
     }
-    // If we don't have the Cart module and are on the checkout page, load the
-    // order from the arguments.
-    elseif (arg(0) == 'checkout' && $order_id = arg(1)) {
-      $order = commerce_order_load($order_id);
-    }
   }
 
   // This is where we build up item list that will be themed