diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart
index 46c9dab3..91be5b3c 100644
--- a/lib/folder_views/common.dart
+++ b/lib/folder_views/common.dart
@@ -96,7 +96,7 @@ void openNoteEditor(
 
     var stateContainer = context.read<GitJournalRepo>();
     var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
-    Scaffold.of(context)
+    ScaffoldMessenger.of(context)
       ..removeCurrentSnackBar()
       ..showSnackBar(snackBar);
   }
diff --git a/lib/folder_views/list_view.dart b/lib/folder_views/list_view.dart
index bed2dc1a..06ea6d1a 100644
--- a/lib/folder_views/list_view.dart
+++ b/lib/folder_views/list_view.dart
@@ -159,7 +159,7 @@ class _FolderListViewState extends State<FolderListView> {
           stateContainer.removeNote(note);
 
           var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
-          Scaffold.of(context)
+          ScaffoldMessenger.of(context)
             ..removeCurrentSnackBar()
             ..showSnackBar(snackBar);
         },
diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index e3aa261e..289db0bb 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -54,8 +54,6 @@ class _FolderViewState extends State<FolderView> {
   bool inSelectionMode = false;
   Note selectedNote;
 
-  var _scaffoldKey = GlobalKey<ScaffoldState>();
-
   @override
   void initState() {
     super.initState();
@@ -139,7 +137,6 @@ class _FolderViewState extends State<FolderView> {
     );
 
     return Scaffold(
-      key: _scaffoldKey,
       appBar: AppBar(
         title: Text(title),
         leading: inSelectionMode ? backButton : GJAppBarMenuButton(),
@@ -229,7 +226,7 @@ class _FolderViewState extends State<FolderView> {
       settings: RouteSettings(name: '/newNote/$routeType'),
     );
     await Navigator.of(context).push(route);
-    _scaffoldKey.currentState.removeCurrentSnackBar();
+    ScaffoldMessenger.of(context).removeCurrentSnackBar();
   }
 
   void _sortButtonPressed() async {
diff --git a/lib/utils.dart b/lib/utils.dart
index 6f6d8cb5..d0392bb9 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -43,7 +43,7 @@ SnackBar buildUndoDeleteSnackbar(
 
 void showSnackbar(BuildContext context, String message) {
   var snackBar = SnackBar(content: Text(message));
-  Scaffold.of(context)
+  ScaffoldMessenger.of(context)
     ..removeCurrentSnackBar()
     ..showSnackBar(snackBar);
 }