diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration.xlf
index 651f09bc2078021e1c59e4ded622c80097485c9f..e95c73ad861c42845ec2f786dba7f6926f409e1d 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration.xlf
@@ -24,6 +24,9 @@
 			<trans-unit id="overview.addSiteConfiguration" resname="overview.addSiteConfiguration">
 				<source>Add new site configuration for this site</source>
 			</trans-unit>
+			<trans-unit id="overview.editSiteConfiguration" resname="overview.editSiteConfiguration">
+				<source>Edit site configuration</source>
+			</trans-unit>
 			<trans-unit id="overview.deleteSiteConfiguration" resname="overview.deleteSiteConfiguration">
 				<source>Delete site configuration</source>
 			</trans-unit>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
index f23286777373450ca28088004e224a74fc6de619..30d3fdf2000cbaa63588e0f8916381a669763a3c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/SiteConfiguration/Overview.html
@@ -92,7 +92,16 @@
                                     </button>
                                 </td>
                                 <td class="align-top">
-                                    {rootPage.title}
+                                    <f:if condition="{page.siteIdentifier}">
+                                        <f:then>
+                                            <f:be.link route="site_configuration.edit" parameters="{site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.editSiteConfiguration')}">
+                                                {rootPage.title}
+                                            </f:be.link>
+                                        </f:then>
+                                        <f:else>
+                                            {rootPage.title}
+                                        </f:else>
+                                    </f:if>
                                 </td>
                                 <td class="align-top">
                                     <f:if condition="{page.siteIdentifier}">
@@ -137,7 +146,7 @@
                                 <td class="align-top nowrap col-control">
                                     <div class="btn-group">
                                         <f:if condition="{page.siteIdentifier}">
-                                            <f:be.link route="site_configuration.edit" parameters="{site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}" class="btn btn-default">
+                                            <f:be.link route="site_configuration.edit" parameters="{site: page.siteIdentifier}" title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration.xlf:overview.editSiteConfiguration')}" class="btn btn-default">
                                                 <core:icon identifier="actions-open" />
                                             </f:be.link>
                                             <button
diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php
index 2db479a02059884de54d1743e42e2c398862879b..5a17b7c907c7955fa1c712cd175c868e3f336140 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php
@@ -38,7 +38,7 @@ final class SiteModuleCest
         $I->see('Site Configuration', 'h1');
 
         $I->amGoingTo('edit an automatically created site configuration');
-        $I->click('Edit');
+        $I->click('Edit site configuration');
         $I->waitForElementNotVisible('#t3js-ui-block');
         $I->see('Edit Site Configuration', 'h1');