diff --git a/bot-code/src/notes/notes.py b/bot-code/src/notes/notes.py
index d877b0f..7b476aa 100644
--- a/bot-code/src/notes/notes.py
+++ b/bot-code/src/notes/notes.py
@@ -166,7 +166,7 @@ def edit_note(notebook: Notebook, name):
     editor.run()
 
     if editor.saved_content is not None:
-        notebook.edit_note(note.name, editor.saved_content)
+        notebook.edit_note(note.id, editor.saved_content)
         console.print(f"Note '{name}' updated successfully!", style="green")
     else:
         console.print(f"Note '{name}' edit cancelled.", style="yellow")
@@ -176,7 +176,12 @@ def delete_note(notebook: Notebook, name):
     while not name:
         name = input("Enter note name: ").strip()
 
-    success = notebook.delete_note(name)
+    note = notebook.get_note_by_name(name)
+    if not note:
+        console.print(f"Note '{name}' not found.", style="yellow")
+        return
+    
+    success = notebook.delete_note(note.id)
     if success:
         console.print(f"Note '{name}' deleted successfully.", style="green")
     else:
diff --git a/bot-code/src/notes/notes_ui.py b/bot-code/src/notes/notes_ui.py
index 9bc7739..c037406 100644
--- a/bot-code/src/notes/notes_ui.py
+++ b/bot-code/src/notes/notes_ui.py
@@ -48,7 +48,10 @@ def action_save(self) -> None:
 
     def action_quit(self) -> None:
         editor = self.query_one(NoteEditor)
-        if (self.x_content == editor.get_text()):
+        changed = self.x_content != editor.get_text()
+        saved = self.saved_content != None and self.saved_content == editor.get_text()
+        
+        if ((not changed) or (changed and saved)):
             self.dismiss(self.saved_content)
             return
         
@@ -248,7 +251,7 @@ async def action_edit(self, editable: bool):
             
         def on_close(content: str):
             if content:
-                self.notebook.edit_note(note.name, content)
+                self.notebook.edit_note(note.id, content)
                 self.list(self.notebook.notes)
         
         screen = EditorScreen(note.name, note.content, editable, on_close=self.handle_editor_quit)