diff --git a/src/screens/Compose.js b/src/screens/Compose.js
index 05d28b2b..4ee3f0dd 100644
--- a/src/screens/Compose.js
+++ b/src/screens/Compose.js
@@ -34,7 +34,6 @@ export default class Compose extends Abstract {
 
   static navigationOptions = ({ navigation, navigationOptions }) => {
     let templateOptions = {
-      title: "Compose",
       rightButton: {
         title: null,
         iconName: StyleKit.nameForIcon("menu"),
@@ -118,7 +117,6 @@ export default class Compose extends Abstract {
 
   configureHeaderBar() {
     this.props.navigation.setParams({
-      title: 'Compose',
       rightButton: {
         title: null,
         iconName: StyleKit.nameForIcon("menu"),
diff --git a/src/screens/Notes/Notes.js b/src/screens/Notes/Notes.js
index a75a2997..486b4cea 100644
--- a/src/screens/Notes/Notes.js
+++ b/src/screens/Notes/Notes.js
@@ -208,6 +208,7 @@ export default class Notes extends Abstract {
   async presentComposer(note) {
     this.handlePrivilegedAction(note && note.content.protected, SFPrivilegesManager.ActionViewProtectedNotes, () => {
       this.props.navigation.navigate("Compose", {
+        title: note ? "Editor" : "Compose",
         noteId: note && note.uuid,
         selectedTagId: this.options.selectedTagIds.length && this.options.selectedTagIds[0],
       });