diff --git a/packages/neon/neon/lib/src/widgets/app_bar.dart b/packages/neon/neon/lib/src/widgets/app_bar.dart
index 84abc267..66782d4a 100644
--- a/packages/neon/neon/lib/src/widgets/app_bar.dart
+++ b/packages/neon/neon/lib/src/widgets/app_bar.dart
@@ -55,6 +55,7 @@ class _NeonAppBarState extends State<NeonAppBar> {
 
   @override
   void dispose() {
+    _searchBarFocusNode.dispose();
     unawaited(_searchTermSubscription.cancel());
     unawaited(_searchTermController.close());
     super.dispose();
diff --git a/packages/neon/neon_notes/lib/pages/note.dart b/packages/neon/neon_notes/lib/pages/note.dart
index d49d4552..96254f7a 100644
--- a/packages/neon/neon_notes/lib/pages/note.dart
+++ b/packages/neon/neon_notes/lib/pages/note.dart
@@ -61,6 +61,8 @@ class _NotesNotePageState extends State<NotesNotePage> {
   void dispose() {
     _contentController.dispose();
     _titleController.dispose();
+    _contentFocusNode.dispose();
+    _titleFocusNode.dispose();
     unawaited(_contentStreamController.close());
     unawaited(_titleStreamController.close());
     super.dispose();