diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 52d3cd787..a842fa08f 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -730,6 +730,8 @@ MainWindow::rideSelected()
 
     // generate a weekly summary of the week associated with the current ride
     generateWeeklySummary();
+
+    saveAndOpenNotes();
 }
 
 
@@ -1123,7 +1125,11 @@ void MainWindow::generateWeeklySummary()
     
     
     weeklySummary->setHtml(summary);
+}
 
+void
+MainWindow::saveAndOpenNotes()
+{
     // First save the contents of the notes window.
     saveNotes();
 
@@ -1197,6 +1203,8 @@ MainWindow::showOptions()
 	// weekly summary
 	generateWeeklySummary();
 
+        saveAndOpenNotes();
+
 	// all plot
         allPlotWindow->zonesChanged();
 
@@ -1290,6 +1298,8 @@ MainWindow::cpintSetCPButtonClicked()
 
     // weekly summary
     generateWeeklySummary();
+
+    saveAndOpenNotes();
   }
 
 }
diff --git a/src/MainWindow.h b/src/MainWindow.h
index aac8b439a..33a5c4c91 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -81,6 +81,7 @@ class MainWindow : public QMainWindow
 	void importRideToDB();
         void scanForMissing();
 	void generateWeeklySummary();
+	void saveAndOpenNotes();
 	void dateChanged(const QDate &);
 
     protected: