diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index 8429776d590dce6bff8015de5b6035f23a523531..ef5d9c6a5234dd1e23d2f97d7bf33c0cb25f353e 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -302,20 +302,19 @@ class EditFileController
         $saveButton = $buttonBar->makeInputButton()
             ->setName('_save')
             ->setValue('1')
-            ->setOnClick('document.editform.submit();')
             ->setForm('EditFileController')
             ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.submit'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL));
 
         // Save and Close button
         $saveAndCloseButton = $buttonBar->makeInputButton()
-            ->setName('_saveandclose')
+            ->setName('_saveandclosedok')
             ->setValue('1')
             ->setForm('EditFileController')
             ->setOnClick(
-                'document.editform.redirect.value='
+                'document.editform.elements.namedItem("data[editfile][0][redirect]").value='
                 . GeneralUtility::quoteJSvalue($this->returnUrl)
-                . '; document.editform.submit();'
+                . ';'
             )
             ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.saveAndClose'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(