diff --git a/app/view/twig/_nav/_primary.twig b/app/view/twig/_nav/_primary.twig
index 16379fd3640..921fd27ce6b 100644
--- a/app/view/twig/_nav/_primary.twig
+++ b/app/view/twig/_nav/_primary.twig
@@ -29,12 +29,14 @@
         </a>
     </li>
 
+    {% if context.contenttype is defined %}
     <li id="liveeditorsavecontinuebutton" class="save-live-editor">
         <a>
             <i class="fa fa-fw fa-flag"></i>
             {{ __('contenttypes.generic.save', {'%contenttype%': context.contenttype.slug}) }}
         </a>
     </li>
+    {% endif %}
 
     <li class="close-live-editor">
         <a>
diff --git a/tests/codeception/acceptance/101-BackendEditor/BackendEditorCest.php b/tests/codeception/acceptance/101-BackendEditor/BackendEditorCest.php
index a6b0b96bd56..657c88a1739 100644
--- a/tests/codeception/acceptance/101-BackendEditor/BackendEditorCest.php
+++ b/tests/codeception/acceptance/101-BackendEditor/BackendEditorCest.php
@@ -82,7 +82,7 @@ public function createRecordsTest(\AcceptanceTester $I)
         $I->fillField('#teaser', 'Woop woop woop! Crazy nice stuff inside!');
         $I->fillField('#body',   'Take it, take it! I have three more of these!');
 
-        $I->click('Save Page');
+        $I->click('Save Page', "#savecontinuebutton");
         $I->see('The new Page has been saved.');
 
         $I->see('A page I made');
@@ -232,7 +232,7 @@ public function checkTemplateFieldsTest(\AcceptanceTester $I)
         $I->see('Template', 'a[data-toggle=tab]');
 
         $I->fillField('#templatefields-section_1', 'This is the contact text');
-        $I->click('Save Page');
+        $I->click('Save Page', "#savecontinuebutton");
 
         $I->click('CONTACT PAGE');
         /*