diff --git a/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
new file mode 100644
index 0000000000000..b60bc71e9e70d
--- /dev/null
+++ b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="msrp_popup"/>
+    <body/>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 869d81563645a..dd5abd433073d 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -72,6 +72,8 @@ if ($product->isSaleable()) {
         } else {
             $data['addToCart']['addToCartButton'] = sprintf(
                 'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
+                (int) $productId) . ',' .
+                sprintf('.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
                 (int) $productId
             );
         }
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index 7ccd606b8f113..e0b3dd77dedcb 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -30,12 +30,11 @@
                         <span id="map-popup-price" class="actual-price"></span>
                     </div>
                 </div>
-                <form action="" method="POST" id="product_addtocart_form_from_popup" class="map-form-addtocart">
-                    <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
+                <form action="" method="POST" class="map-form-addtocart">
+                    <input type="hidden" name="product" class="product_id" value="" />
                     <button type="button"
                             title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
-                            class="action tocart primary"
-                            id="map-popup-button">
+                            class="action tocart primary">
                         <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                     </button>
                     <div class="additional-addtocart-box">