diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php
index e8ec1765afe0447b4d49df9c98a9425ec5f1c699..3696b17d0e55334cbd18faabe04777d546e11c64 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php
@@ -74,7 +74,7 @@ class RedirectModuleCest
         $this->openAndCloseTheEditForm($I, $sourceHost . ', ' . $sourcePath);
 
         $I->amGoingTo('test edit on edit button');
-        $I->click('table.table-striped > tbody > tr > td:nth-child(6) > div > a:nth-child(2)');
+        $I->click('table.table-striped > tbody > tr > td:nth-child(6) > div > a:nth-child(1)');
         $this->openAndCloseTheEditForm($I, $sourceHost . ', ' . $sourcePath);
     }
 
diff --git a/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html b/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
index b868e846af8b230cc97b7a61b530d974f137968c..7f6b557069752fb5a41df6082995acc6d14a3387 100644
--- a/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
+++ b/typo3/sysext/redirects/Resources/Private/Templates/Management/Overview.html
@@ -114,9 +114,11 @@
                                         <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
                                     </f:then>
                                     <f:else>
-                                        <f:link.external class="btn btn-default" uri="{f:if(condition: '{redirect.source_host} == \'*\'', then: '', else: redirect.source_host)}{redirect.source_path}" target="_blank" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:view_redirect')}">
-                                            <core:icon identifier="actions-view-page" />
-                                        </f:link.external>
+                                        <f:if condition="{redirect.source_host} != '*'">
+                                            <f:link.external class="btn btn-default" uri="{redirect.source_host}{redirect.source_path}" target="_blank" title="{f:translate(key: 'LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:view_redirect')}">
+                                                <core:icon identifier="actions-view-page" />
+                                            </f:link.external>
+                                        </f:if>
                                     </f:else>
                                 </f:if>
                                 <be:link.editRecord class="btn btn-default" table="sys_redirect" uid="{redirect.uid}" title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:edit')}">