diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index b71eadea028641416be173ce6700cb0b860e8561..b1d12ed35ed1e3912a12ab4f13e910489f938595 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -16,7 +16,7 @@
             You need to create a simple product for each configuration (Ex: a product for each color).');?>
             </div>
         </div>
-        <div class="product-create-configuration-actions">
+        <div class="product-create-configuration-actions" data-action="product-create-configuration-buttons">
             <div class="product-create-configuration-action">
                 <button type="button" data-action="open-steps-wizard" title="Create Product Configurations"
                         class="action-secondary" data-bind="click: open">
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
index 0c4077543059fd746f88a67b946889ca286ce287..dac2edad7be49ec47e029d391901da6842ed6154 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -67,9 +67,9 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
         }
     };
 
-    var configurationSectionMessageHandler = (new function(attributeTitle, attributeTab) {
+    var configurationSectionMessageHandler = (new function(attributeTitle, buttons) {
         this.title = jQuery(attributeTitle);
-        this.buttons = jQuery('button', attributeTab);
+        this.buttons = jQuery(buttons);
         this.newText = '<?= /* @noEscape */ __('Configurations cannot be created for a standard product with downloadable files.'
              . ' To create configurations, first remove all downloadable files.');?>';
         this.oldText = this.title.text();
@@ -86,7 +86,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
             this.title.text(this.newText);
             this.buttons.hide();
         }
-    }('[data-role="product-create-configuration-info"]', '[data-tab="super_config"]'));
+    }('[data-role="product-create-configuration-info"]', '[data-action="product-create-configuration-buttons"]'));
 
     downloadableCheckbox.on('change', function () {
         switchConfigurationSectionMessage(!jQuery(this).is(':checked'));