diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart
index a3ac764b..c9043408 100644
--- a/lib/folder_views/common.dart
+++ b/lib/folder_views/common.dart
@@ -6,8 +6,10 @@ import 'package:gitjournal/folder_views/card_view.dart';
 import 'package:gitjournal/folder_views/grid_view.dart';
 import 'package:gitjournal/folder_views/journal_view.dart';
 import 'package:gitjournal/screens/note_editor.dart';
+import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:provider/provider.dart';
 
 import 'standard_view.dart';
 
@@ -70,7 +72,8 @@ void openNoteEditor(BuildContext context, Note note) async {
   if (showUndoSnackBar != null) {
     Log.d("Showing an undo snackbar");
 
-    var snackBar = buildUndoDeleteSnackbar(context, note);
+    var stateContainer = Provider.of<StateContainer>(context, listen: false);
+    var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
     Scaffold.of(context)
       ..removeCurrentSnackBar()
       ..showSnackBar(snackBar);
diff --git a/lib/folder_views/list_view.dart b/lib/folder_views/list_view.dart
index 46fc9863..0160dec2 100644
--- a/lib/folder_views/list_view.dart
+++ b/lib/folder_views/list_view.dart
@@ -150,7 +150,7 @@ class _FolderListViewState extends State<FolderListView> {
             Provider.of<StateContainer>(context, listen: false);
         stateContainer.removeNote(note);
 
-        var snackBar = buildUndoDeleteSnackbar(context, note);
+        var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
         Scaffold.of(context)
           ..removeCurrentSnackBar()
           ..showSnackBar(snackBar);
diff --git a/lib/utils.dart b/lib/utils.dart
index 45706983..5938c53a 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -3,7 +3,6 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:package_info/package_info.dart';
-import 'package:provider/provider.dart';
 
 import 'app.dart';
 import 'core/note.dart';
@@ -24,16 +23,14 @@ Future<String> getVersionString() async {
   return versionText;
 }
 
-SnackBar buildUndoDeleteSnackbar(BuildContext context, Note deletedNote) {
+SnackBar buildUndoDeleteSnackbar(
+    StateContainer stateContainer, Note deletedNote) {
   return SnackBar(
     content: const Text('Note Deleted'),
     action: SnackBarAction(
       label: "Undo",
       onPressed: () {
         Log.d("Undoing delete");
-
-        var stateContainer =
-            Provider.of<StateContainer>(context, listen: false);
         stateContainer.undoRemoveNote(deletedNote);
       },
     ),