diff --git a/lib/core/notes_folder_fs.dart b/lib/core/notes_folder_fs.dart
index f4f1a791..eb15d4bb 100644
--- a/lib/core/notes_folder_fs.dart
+++ b/lib/core/notes_folder_fs.dart
@@ -318,6 +318,12 @@ class NotesFolderFS with NotesFolderNotifier implements NotesFolder {
   }
 
   void removeFolder(NotesFolderFS folder) {
+    var notesCopy = List<Note>.from(folder._notes);
+    notesCopy.forEach(folder.remove);
+
+    var foldersCopy = List<NotesFolderFS>.from(folder._folders);
+    foldersCopy.forEach(folder.removeFolder);
+
     _removeFolderListeners(folder);
 
     assert(_folders.indexWhere((f) => f.folderPath == folder.folderPath) != -1);