diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index 3a334708e96763dd563ddb12c65d38b6b8ab0db7..f6a5ba13a84019150b28b0cd90a27f89dab22248 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -263,7 +263,6 @@
                                                                     </item>
                                                                 </item>
                                                             </item>
-                                                            <!-- TODO: add billing address form -->
                                                             <item name="beforeMethods" xsi:type="array">
                                                                 <item name="component" xsi:type="string">uiComponent</item>
                                                                 <item name="displayArea" xsi:type="string">beforeMethods</item>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 4a060c33fdf0e1109efa102c46e388ce215e84d8..945cd2802754e39b92161091615b8e09e3ad0e4e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -35,6 +35,13 @@ define(
                 template: 'Magento_Checkout/billing-address'
             },
 
+            initialize: function () {
+                this._super();
+                quote.paymentMethod.subscribe(function() {
+                    this.cancelAddressEdit();
+                }, this);
+            },
+
             initObservable: function () {
                 this._super()
                     .observe({