diff --git a/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js b/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
index 18ceca99..7239bd82 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
@@ -570,7 +570,7 @@ class EditorToolbar extends React.Component {
       <ToolbarContainer>
         <ToolbarSectionBackLink
           onClick={() => {
-            if (history.length > 0) {
+            if (history.length > 2) {
               history.goBack();
             } else {
               history.push(`/collections/${collection.get('name')}`);