diff --git a/lib/app.dart b/lib/app.dart
index ac6869b4..f47e2d6f 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -217,7 +217,8 @@ class _JournalAppState extends State<JournalApp> {
         return;
       }
 
-      var editor = Settings.instance.defaultEditor.toInternalString();
+      var settings = Provider.of<Settings>(context, listen: false);
+      var editor = settings.defaultEditor.toInternalString();
       _navigatorKey.currentState.pushNamed("/newNote/$editor");
     };
 
diff --git a/lib/widgets/note_viewer.dart b/lib/widgets/note_viewer.dart
index 6a63e485..af8ce95d 100644
--- a/lib/widgets/note_viewer.dart
+++ b/lib/widgets/note_viewer.dart
@@ -32,6 +32,8 @@ class NoteViewer extends StatelessWidget {
       ),
     );
 
+    var settings = Provider.of<Settings>(context);
+
     // Copied from MarkdownStyleSheet except Grey is replaced with Highlight color
     var markdownStyleSheet = MarkdownStyleSheet.fromTheme(theme).copyWith(
       code: theme.textTheme.bodyText2.copyWith(
@@ -117,7 +119,7 @@ class NoteViewer extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 16.0),
-          if (Settings.instance.experimentalBacklinks)
+          if (settings.experimentalBacklinks)
             NoteBacklinkRenderer(note: note, rootFolder: rootFolder),
           // _buildFooter(context),
         ],