diff --git a/modules/order/src/Entity/Order.php b/modules/order/src/Entity/Order.php
index d59382b8..5f1ca2b6 100644
--- a/modules/order/src/Entity/Order.php
+++ b/modules/order/src/Entity/Order.php
@@ -107,7 +107,7 @@ class Order extends CommerceContentEntityBase implements OrderInterface {
     $label = NULL;
     $order_number = $this->getOrderNumber();
     if ($order_number) {
-      $label = $order_number;
+      $label = $this->t('Order @order_number', ['@order_number' => $order_number]);
     }
     elseif ($this->getState()->getId() === 'draft' && !$this->isNew()) {
       $label = $this->t('Draft @id', ['@id' => $this->id()]);
diff --git a/modules/order/src/Form/OrderForm.php b/modules/order/src/Form/OrderForm.php
index bececc90..480bdeb7 100644
--- a/modules/order/src/Form/OrderForm.php
+++ b/modules/order/src/Form/OrderForm.php
@@ -168,7 +168,13 @@ class OrderForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $this->entity->save();
-    $this->messenger()->addMessage($this->t('The order %label has been successfully saved.', ['%label' => $this->entity->label()]));
+    $label = $this->entity->label();
+    if ($label) {
+      $this->messenger()->addStatus($this->t('%label saved.', ['%label' => $this->entity->label()]));
+    }
+    else {
+      $this->messenger()->addStatus($this->t('Order saved.'));
+    }
     $form_state->setRedirect('entity.commerce_order.canonical', ['commerce_order' => $this->entity->id()]);
   }
 
diff --git a/modules/order/tests/src/FunctionalJavascript/OrderAdminTest.php b/modules/order/tests/src/FunctionalJavascript/OrderAdminTest.php
index 7ca11018..dd78a3bf 100644
--- a/modules/order/tests/src/FunctionalJavascript/OrderAdminTest.php
+++ b/modules/order/tests/src/FunctionalJavascript/OrderAdminTest.php
@@ -148,7 +148,7 @@ class OrderAdminTest extends OrderWebDriverTestBase {
 
     // There is no adjustment - the order should save successfully.
     $this->submitForm([], 'Save');
-    $this->assertSession()->pageTextContains('The order Draft 1 has been successfully saved.');
+    $this->assertSession()->pageTextContains('Draft 1 saved.');
     $order = Order::load(1);
     $this->assertNull($order->getBillingProfile());
 
@@ -165,7 +165,7 @@ class OrderAdminTest extends OrderWebDriverTestBase {
     $this->assertSession()->pageTextContains('The adjustment label field is required.');
     $edit['adjustments[0][definition][label]'] = 'Test fee';
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains('The order Draft 1 has been successfully saved.');
+    $this->assertSession()->pageTextContains('Draft 1 saved.');
 
     $this->drupalGet('/admin/commerce/orders');
     $order_number = $this->getSession()->getPage()->findAll('css', 'tr td.views-field-order-number');
@@ -311,7 +311,7 @@ class OrderAdminTest extends OrderWebDriverTestBase {
 
     $this->drupalGet($order->toUrl('edit-form'));
     $this->submitForm([], 'Save');
-    $this->assertSession()->pageTextContains('The order 1 has been successfully saved.');
+    $this->assertSession()->pageTextContains('Order 1 saved.');
   }
 
   /**
diff --git a/modules/order/tests/src/Kernel/Entity/OrderTest.php b/modules/order/tests/src/Kernel/Entity/OrderTest.php
index 93381074..eef56fba 100644
--- a/modules/order/tests/src/Kernel/Entity/OrderTest.php
+++ b/modules/order/tests/src/Kernel/Entity/OrderTest.php
@@ -157,7 +157,7 @@ class OrderTest extends OrderKernelTestBase {
     $order->setOrderNumber(7);
     $this->assertEquals(7, $order->getOrderNumber());
     $this->assertFalse($order->isPaid());
-    $this->assertEquals('7', $order->label());
+    $this->assertEquals('Order 7', $order->label());
 
     $order->setStore($this->store);
     $this->assertEquals($this->store, $order->getStore());