diff --git a/administrator/components/com_finder/tmpl/indexer/default.php b/administrator/components/com_finder/tmpl/indexer/default.php
index 7a4cef625958d..6c67a4151f2b3 100644
--- a/administrator/components/com_finder/tmpl/indexer/default.php
+++ b/administrator/components/com_finder/tmpl/indexer/default.php
@@ -13,9 +13,10 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+Text::script('COM_FINDER_INDEXER_MESSAGE_COMPLETE', true);
+
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('script', 'com_finder/indexer.min.js', array('version' => 'auto', 'relative' => true));
-$this->document->addScriptDeclaration('var msg = "' . Text::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE') . '";');
 ?>
 
 <div class="text-center">
diff --git a/build/media_source/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.es6.js
index 763fc0aa3a872..1122fdbe4a7f8 100644
--- a/build/media_source/com_finder/js/indexer.es6.js
+++ b/build/media_source/com_finder/js/indexer.es6.js
@@ -54,11 +54,12 @@
           progressBar.style.width = `${progress}%`;
           progressBar.setAttribute('aria-valuenow', progress);
         }
+
         // Auto close the window
-        // if (message === msg) {
-        //   removeElement('progress');
-        //   Joomla.Modal.getCurrent().close();
-        // }
+        if (message === Joomla.Text._('COM_FINDER_INDEXER_MESSAGE_COMPLETE')) {
+          removeElement('progress');
+          window.parent.Joomla.Modal.getCurrent().close();
+        }
       }
     };