1 files changed, 5 insertions, 2 deletions
diff --git a/src/bibiman.rs b/src/bibiman.rs
index 87963dc..6d21f8c 100644
--- a/src/bibiman.rs
+++ b/src/bibiman.rs
@@ -755,13 +755,15 @@ impl Bibiman {
     pub fn create_note(&mut self, cfg: &BibiConfig) -> Result<()> {
         // Index of selected entry
         let entry_idx = self.entry_table.entry_table_state.selected().unwrap();
-        let citekey = self.entry_table.entry_table_items[entry_idx].citekey();
+        let citekey = self.entry_table.entry_table_items[entry_idx]
+            .citekey
+            .clone();
 
         // Index of selected popup field
         let popup_idx = self.popup_area.popup_state.selected().unwrap();
         let ext = self.popup_area.popup_list[popup_idx].1.clone();
 
-        let basename = PathBuf::from(citekey).with_extension(ext);
+        let basename = PathBuf::from(&citekey).with_extension(ext);
         let path = cfg.general.note_path.as_ref().unwrap();
 
         let new_file = path.join(basename);
@@ -775,6 +777,7 @@ impl Bibiman {
         File::create_new(new_file).unwrap();
         self.close_popup();
         self.update_lists(cfg);
+        self.select_entry_by_citekey(&citekey);
         Ok(())
     }