diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index 7ce960f7..c3e911a7 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -171,9 +171,9 @@ class _FolderViewState extends State<FolderView> {
 
     var settings = Provider.of<Settings>(context);
 
-    if (editorType == EditorType.Journal) {
-      if (settings.journalEditorSingleNote) {
-        var note = await getTodayJournalEntry(fsFolder.rootFolder);
+    if (editorType == EditorType.Journal && settings.journalEditorSingleNote) {
+      var note = await getTodayJournalEntry(fsFolder.rootFolder);
+      if (note != null) {
         return openNoteEditor(
           context,
           note,