diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 27f710068e69bf1584bc2ab2a0bb310e4912167b..aa253cf289b83afb855efd4f8baca67963676a95 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -1491,7 +1491,7 @@ class EditDocumentController
      */
     protected function getCloseUrl(): string
     {
-        $closeUrl = GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Private/Templates/Close.html');
+        $closeUrl = GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Public/Html/Close.html');
         return PathUtility::getAbsoluteWebPath($closeUrl);
     }
 
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Close.html b/typo3/sysext/backend/Resources/Private/Templates/Close.html
index e5fbc77bef0b6706b2845d917b681e84c0f38bc7..5a0cfc59ebc8e6e6a1ebe742d9066ecbc89939fa 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Close.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Close.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<!-- Close script, used in particular by FormEngine to close the current edit window -->
-		<!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Private/Templates/close.html -->
+		<!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Private/Templates/Close.html -->
 		<meta charset="utf-8" />
 		<title>Close</title>
 		<script type="text/javascript">
@@ -12,4 +12,4 @@
 	</head>
 	<body>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/backend/Resources/Public/Html/Close.html b/typo3/sysext/backend/Resources/Public/Html/Close.html
new file mode 100644
index 0000000000000000000000000000000000000000..1a4faf689b96d77db077a63fe3547a161f38ed2c
--- /dev/null
+++ b/typo3/sysext/backend/Resources/Public/Html/Close.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<!-- Close script, used in particular by FormEngine to close the current edit window -->
+		<!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Public/Html/Close.html -->
+		<meta charset="utf-8" />
+		<title>Close</title>
+		<script type="text/javascript">
+			self.close();
+			window.opener.location.reload(true);
+		</script>
+	</head>
+	<body>
+	</body>
+</html>
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 011873e621b98671f1f64849a3637e5829825d9d..fcc311b51d26fc2f94a83717ceb9b52fa6528c91 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -299,7 +299,7 @@ class FrontendEditPanel
     {
         $width = MathUtility::forceIntegerInRange($this->backendUser->getTSConfigVal('options.feedit.popupWidth'), 690, 5000, 690);
         $height = MathUtility::forceIntegerInRange($this->backendUser->getTSConfigVal('options.feedit.popupHeight'), 500, 5000, 500);
-        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . rawurlencode(PathUtility::getAbsoluteWebPath(GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Private/Templates/Close.html')))) . ',\'FEquickEditWindow\',\'width=' . $width . ',height=' . $height . ',status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
+        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . rawurlencode(PathUtility::getAbsoluteWebPath(GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Public/Html/Close.html')))) . ',\'FEquickEditWindow\',\'width=' . $width . ',height=' . $height . ',status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
         return '<a href="#" class="typo3-editPanel-btn typo3-editPanel-btn-default frontEndEditIconLinks ' . htmlspecialchars($additionalClasses) . '" onclick="' . htmlspecialchars($onclick) . '" style="display: none;">' . $string . '</a>';
     }