Merge remote-tracking branch 'origin/MAGETWO-28913' into MAGETWO-35251

Author: Valeriy Nayda

app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

@@ -132,6 +132,11 @@ define([
                             at: 'center top',
                             of: 'body'
                         },
+                        create: function (event, ui) {
+                            $(document).on('click', '#productGrid_massaction-form button', function () {
+                                $('#import-custom-options-apply-button').trigger('click', 'massActionTrigger');
+                            });
+                        },
                         open: function () {
                             $(this).closest('.ui-dialog').addClass('ui-dialog-active');
 
@@ -195,19 +200,14 @@ define([
                             }]
                     });
                     importContainer.load(
-                        this.options.productGridUrl, {
-                            form_key: this.options.formKey
-                        },
+                        this.options.productGridUrl,
+                        {form_key: this.options.formKey},
                         function () {
                             importContainer.dialog('open');
                         }
                     );
                 },
 
-                'click #productGrid_massaction-form button': function () {
-                    $('#import-custom-options-apply-button').trigger('click', 'massActionTrigger');
-                },
-
                 /**
                  * Change custom option type
                  */
@@ -470,4 +470,4 @@ define([
         }
     });
 
-});
+});