diff --git a/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js b/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
index 5da4eb64..c8e28d65 100644
--- a/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
+++ b/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import EntryEditorToolbar from '../EntryEditorToolbar';
 
 describe('EntryEditorToolbar', () => {
-  it('should have both buttons enabled initially', () => {
+  it('should have the Save button disabled initally, and the Cancel button enabled', () => {
     const component = shallow(
       <EntryEditorToolbar
         onPersist={() => {}}
@@ -15,6 +15,19 @@ describe('EntryEditorToolbar', () => {
     expect(tree).toMatchSnapshot();
   });
 
+  it('should enable the Save button', () => {
+    const component = shallow(
+      <EntryEditorToolbar
+        enableSave
+        onPersist={() => {}}
+        onCancelEdit={() => {}}
+        onDelete={() => {}}
+      />
+    );
+    const tree = component.html();
+    expect(tree).toMatchSnapshot();
+  });
+
   it('should disable and update label of Save button when persisting', () => {
     const component = shallow(
       <EntryEditorToolbar
diff --git a/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap b/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
index f51fe48a..74155fcc 100644
--- a/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
+++ b/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
@@ -2,4 +2,6 @@
 
 exports[`EntryEditorToolbar should disable and update label of Save button when persisting 1`] = `"<div><button disabled=\\"\\" class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Saving...</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
 
-exports[`EntryEditorToolbar should have both buttons enabled initially 1`] = `"<div><button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
+exports[`EntryEditorToolbar should enable the Save button 1`] = `"<div><button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
+
+exports[`EntryEditorToolbar should have the Save button disabled initally, and the Cancel button enabled 1`] = `"<div><button disabled=\\"\\" class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;