diff --git a/AdobeStockImageAdminUi/Plugin/AddSearchButton.php b/AdobeStockImageAdminUi/Plugin/AddSearchButton.php
index ebaea032a4b7..69c212be8236 100644
--- a/AdobeStockImageAdminUi/Plugin/AddSearchButton.php
+++ b/AdobeStockImageAdminUi/Plugin/AddSearchButton.php
@@ -61,7 +61,6 @@ public function beforeSetLayout(Container $subject, LayoutInterface $layout): vo
                     'class' => 'action-secondary',
                     'label' => __('Search Adobe Stock'),
                     'type' => 'button',
-                    'onclick' => 'jQuery("#adobe-stock-images-search-modal").trigger("openModal");'
                 ],
                 0,
                 0,
diff --git a/AdobeStockImageAdminUi/view/adminhtml/templates/panel.phtml b/AdobeStockImageAdminUi/view/adminhtml/templates/panel.phtml
index 4ac2a369c5d6..fa881f6e6c5b 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/templates/panel.phtml
+++ b/AdobeStockImageAdminUi/view/adminhtml/templates/panel.phtml
@@ -9,7 +9,7 @@
  */
 ?>
 
-<div id="adobe-stock-images-search-modal" style="display: none;">
+<div id="adobe-stock-images-search-modal" class="adobe-search-images-modal" style="display: none;">
     <div class="adobe-stock-images-search-modal-content">
         <?= $block->getChildHtml(); ?>
     </div>
@@ -30,3 +30,21 @@
         }
     }
 </script>
+<script>
+require([
+    'jquery',
+], function ($) {
+	$(function () {
+	   var searchButton = "#search_adobe_stock",
+	       adobeStockModal = ".adobe-search-images-modal";
+
+		$(searchButton).click(function() {
+		   if ($(adobeStockModal).length > 1) {
+			$(adobeStockModal)[0].remove(); 
+		   }		   
+                 $(adobeStockModal).trigger("openModal");
+		});
+	});
+});
+</script>
+