diff --git a/src/notebook.cc b/src/notebook.cc
index e2e81ae..4856302 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -314,7 +314,10 @@ void Notebook::open(const boost::filesystem::path &file_path_, size_t notebook_i
     if(index!=static_cast<size_t>(-1))
       close(index);
   }));
-  
+
+  if(source_view->update_tab_label)
+      source_view->update_tab_label(source_view);
+
   //Add star on tab label when the page is not saved:
   source_view->get_buffer()->signal_modified_changed().connect([this, source_view]() {
     if(source_view->update_tab_label)
@@ -527,6 +530,10 @@ bool Notebook::close(size_t index) {
     hboxes.erase(hboxes.begin()+index);
     tab_labels.erase(tab_labels.begin()+index);
   }
+  for(auto view: get_views()) { // Update all view tabs in case one clicks cross to close a buffer
+    if(view->update_tab_label)
+      view->update_tab_label(view);
+  }
   return true;
 }