diff --git a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
index a91aabeb..364f2c04 100644
--- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
+++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
@@ -98,14 +98,16 @@ class PaymentInformation extends CheckoutPaneBase {
    */
   public function buildPaneSummary() {
     $billing_profile = $this->order->getBillingProfile();
-    if ($this->order->getTotalPrice()->isZero() && $billing_profile) {
-      // Only the billing information was collected.
-      $view_builder = $this->entityTypeManager->getViewBuilder('profile');
-      $summary = [
-        '#title' => $this->t('Billing information'),
-        'profile' => $view_builder->view($billing_profile, 'default'),
-      ];
-      return $summary;
+    if ($this->order->isPaid() || $this->order->getTotalPrice()->isZero()) {
+      if ($billing_profile) {
+        // Only the billing information was collected.
+        $view_builder = $this->entityTypeManager->getViewBuilder('profile');
+        $summary = [
+          '#title' => $this->t('Billing information'),
+          'profile' => $view_builder->view($billing_profile, 'default'),
+        ];
+        return $summary;
+      }
     }
 
     $summary = [];
@@ -136,8 +138,9 @@ class PaymentInformation extends CheckoutPaneBase {
    * {@inheritdoc}
    */
   public function buildPaneForm(array $pane_form, FormStateInterface $form_state, array &$complete_form) {
-    if ($this->order->getTotalPrice()->isZero()) {
-      // Free orders don't need payment, collect just the billing information.
+    if ($this->order->isPaid() || $this->order->getTotalPrice()->isZero()) {
+      // No payment is needed if the order is free or has already been paid.
+      // In that case, collect just the billing information.
       $pane_form['#title'] = $this->t('Billing information');
       $pane_form = $this->buildBillingProfileForm($pane_form, $form_state);
       return $pane_form;
@@ -291,7 +294,7 @@ class PaymentInformation extends CheckoutPaneBase {
    * {@inheritdoc}
    */
   public function validatePaneForm(array &$pane_form, FormStateInterface $form_state, array &$complete_form) {
-    if ($this->order->getTotalPrice()->isZero()) {
+    if ($this->order->isPaid() || $this->order->getTotalPrice()->isZero()) {
       return;
     }
 
@@ -305,7 +308,7 @@ class PaymentInformation extends CheckoutPaneBase {
    * {@inheritdoc}
    */
   public function submitPaneForm(array &$pane_form, FormStateInterface $form_state, array &$complete_form) {
-    if ($this->order->getTotalPrice()->isZero()) {
+    if ($this->order->isPaid() || $this->order->getTotalPrice()->isZero()) {
       $this->order->setBillingProfile($pane_form['billing_information']['#profile']);
       return;
     }
diff --git a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
index b60a5540..b971ed8d 100644
--- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
+++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
@@ -129,8 +129,8 @@ class PaymentProcess extends CheckoutPaneBase {
    * {@inheritdoc}
    */
   public function isVisible() {
-    if ($this->order->getTotalPrice()->isZero()) {
-      // Hide the pane for free orders, since they don't need a payment.
+    if ($this->order->isPaid() || $this->order->getTotalPrice()->isZero()) {
+      // No payment is needed if the order is free or has already been paid.
       return FALSE;
     }
     $payment_info_pane = $this->checkoutFlow->getPane('payment_information');
@@ -160,7 +160,7 @@ class PaymentProcess extends CheckoutPaneBase {
     /** @var \Drupal\commerce_payment\Entity\PaymentInterface $payment */
     $payment = $payment_storage->create([
       'state' => 'new',
-      'amount' => $this->order->getTotalPrice(),
+      'amount' => $this->order->getBalance(),
       'payment_gateway' => $payment_gateway->id(),
       'order_id' => $this->order->id(),
     ]);
diff --git a/modules/payment/tests/src/FunctionalJavascript/PaymentCheckoutTest.php b/modules/payment/tests/src/FunctionalJavascript/PaymentCheckoutTest.php
index f77716ad..42d60312 100644
--- a/modules/payment/tests/src/FunctionalJavascript/PaymentCheckoutTest.php
+++ b/modules/payment/tests/src/FunctionalJavascript/PaymentCheckoutTest.php
@@ -7,6 +7,7 @@ use Drupal\commerce_order\Adjustment;
 use Drupal\commerce_order\Entity\Order;
 use Drupal\commerce_payment\Entity\Payment;
 use Drupal\commerce_payment\Entity\PaymentGateway;
+use Drupal\commerce_price\Price;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 use Drupal\Tests\commerce\FunctionalJavascript\JavascriptTestTrait;
 
@@ -549,6 +550,13 @@ class PaymentCheckoutTest extends CommerceBrowserTestBase {
     $this->drupalGet($this->product->toUrl()->toString());
     $this->submitForm([], 'Add to cart');
     $this->drupalGet('checkout/1');
+
+    // Make the order partially paid, to confirm that checkout only charges
+    // for the remaining amount.
+    $order = Order::load(1);
+    $order->setTotalPaid(new Price('20', 'USD'));
+    $order->save();
+
     $radio_button = $this->getSession()->getPage()->findField('Cash on delivery');
     $radio_button->click();
     $this->waitForAjaxToFinish();
@@ -575,7 +583,7 @@ class PaymentCheckoutTest extends CommerceBrowserTestBase {
     // Verify that a payment was created.
     $payment = Payment::load(1);
     $this->assertNotNull($payment);
-    $this->assertEquals($payment->getAmount(), $order->getTotalPrice());
+    $this->assertEquals($payment->getAmount(), $order->getBalance());
   }
 
   /**
@@ -617,4 +625,37 @@ class PaymentCheckoutTest extends CommerceBrowserTestBase {
     $this->assertSession()->pageTextContains('Your order number is 1. You can view your order on your account page when logged in.');
   }
 
+  /**
+   * Tests a paid order, where only the billing information is collected.
+   */
+  public function testPaidOrder() {
+    $this->drupalGet($this->product->toUrl()->toString());
+    $this->submitForm([], 'Add to cart');
+
+    $order = Order::load(1);
+    $order->setTotalPaid($order->getTotalPrice());
+    $order->save();
+
+    $this->drupalGet('checkout/1');
+    $this->assertSession()->pageTextContains('Billing information');
+    $this->assertSession()->pageTextNotContains('Payment information');
+    $this->submitForm([
+      'payment_information[billing_information][address][0][address][given_name]' => 'Johnny',
+      'payment_information[billing_information][address][0][address][family_name]' => 'Appleseed',
+      'payment_information[billing_information][address][0][address][address_line1]' => '123 New York Drive',
+      'payment_information[billing_information][address][0][address][locality]' => 'New York City',
+      'payment_information[billing_information][address][0][address][administrative_area]' => 'NY',
+      'payment_information[billing_information][address][0][address][postal_code]' => '10001',
+    ], 'Continue to review');
+
+    $this->assertSession()->pageTextContains('Billing information');
+    $this->assertSession()->pageTextNotContains('Payment information');
+    $this->assertSession()->pageTextContains('Example');
+    $this->assertSession()->pageTextContains('Johnny Appleseed');
+    $this->assertSession()->pageTextContains('123 New York Drive');
+
+    $this->submitForm([], 'Complete checkout');
+    $this->assertSession()->pageTextContains('Your order number is 1. You can view your order on your account page when logged in.');
+  }
+
 }
