diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java
index 02c8c3788..f62aebd67 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java
@@ -1303,24 +1303,18 @@ private String getNoteContentString() {
     @Override
     public void onSharePublishClicked() {
         publishNote();
-        if (mShareBottomSheet != null) {
-            mShareBottomSheet.dismiss();
-        }
+        dismissBottomSheet(mShareBottomSheet);
     }
 
     @Override
     public void onShareUnpublishClicked() {
         unpublishNote();
-        if (mShareBottomSheet != null) {
-            mShareBottomSheet.dismiss();
-        }
+        dismissBottomSheet(mShareBottomSheet);
     }
 
     @Override
     public void onWordPressPostClicked() {
-        if (mShareBottomSheet != null) {
-            mShareBottomSheet.dismiss();
-        }
+        dismissBottomSheet(mShareBottomSheet);
 
         if (getFragmentManager() == null) {
             return;
@@ -1346,7 +1340,7 @@ public void onShareCollaborateClicked() {
 
     @Override
     public void onShareDismissed() {
-
+        dismissBottomSheet(mShareBottomSheet);
     }
 
     /**
@@ -1356,25 +1350,23 @@ public void onShareDismissed() {
     @Override
     public void onHistoryCancelClicked() {
         mContentEditText.setText(mNote.getContent());
-        if (mHistoryBottomSheet != null) {
-            mHistoryBottomSheet.dismiss();
-        }
+        dismissBottomSheet(mHistoryBottomSheet);
     }
 
     @Override
     public void onHistoryRestoreClicked() {
-        if (mHistoryBottomSheet != null) {
-            mHistoryBottomSheet.dismiss();
-        }
+        dismissBottomSheet(mHistoryBottomSheet);
         saveAndSyncNote();
     }
 
     @Override
     public void onHistoryDismissed() {
-        if (!mHistoryBottomSheet.didTapOnButton()) {
+        if (mHistoryBottomSheet != null && !mHistoryBottomSheet.didTapOnButton()) {
             mContentEditText.setText(mNote.getContent());
         }
 
+        dismissBottomSheet(mHistoryBottomSheet);
+
         if (mHistoryTimeoutHandler != null) {
             mHistoryTimeoutHandler.removeCallbacks(mHistoryTimeoutRunnable);
         }
@@ -1385,6 +1377,12 @@ public void onHistoryUpdateNote(String content) {
         mContentEditText.setText(content);
     }
 
+    private void dismissBottomSheet(BottomSheetDialogBase bottomSheet) {
+        if (bottomSheet != null) {
+            bottomSheet.dismiss();
+        }
+    }
+
     private void saveNote() {
         try {
             if (mNote == null || mNotesBucket == null || mContentEditText == null || mIsLoadingNote ||