diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index f507d9ee30ec0bf3a8094bdc5fd7796f047e3cd3..3b1b57e353538a51a2f381ecac5159539b9b4986 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -461,4 +461,9 @@ class Option extends Widget
     {
         return $this->getUrl('catalog/*/customOptions');
     }
+
+    public function getCurrentProductId()
+    {
+        return $this->getProduct()->getId();
+    }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
index e7aeff7affaef4991431f27d46d5a67cebf558f8..d98abfd533f7987ec4057e2736d3bebcccb1be80 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
@@ -75,8 +75,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
             null
         );
 
-        $this->_productFactory->create()->getMediaGalleryEntries();
-
         return $this;
     }
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index f0baae3a2bdd35cabc7887f21b0edbc65d621e3e..778c8657a83c25d67548a80f156d9f3e674cd39c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -97,7 +97,7 @@ jQuery(function ($) {
             'customOptionsUrl' => $block->getCustomOptionsUrl(),
             'isReadonly' => $block->isReadonly(),
             'itemCount' => $block->getItemCount(),
-            'currentProductId' => $block->getRequest()->getParam('id'),
+            'currentProductId' => $block->getCurrentProductId(),
         ]
     )?>);
     //adding data to templates