diff --git a/src/Charts/DiaryWindow.cpp b/src/Charts/DiaryWindow.cpp
index 01a36c713..f5489ac4d 100644
--- a/src/Charts/DiaryWindow.cpp
+++ b/src/Charts/DiaryWindow.cpp
@@ -27,7 +27,7 @@
 #include "HelpWhatsThis.h"
 
 DiaryWindow::DiaryWindow(Context *context) :
-    GcChartWindow(context), context(context), active(false)
+    GcChartWindow(context), ride(nullptr), context(context), active(false)
 {
     setControls(NULL);
 
@@ -142,11 +142,12 @@ DiaryWindow::setDefaultView(int view)
 void
 DiaryWindow::rideSelected()
 {
-    if (active) {
+    // ignore if already active or the selected activity has not changed
+    if (active || ride == myRideItem) {
         return;
     }
 
-    RideItem *ride = myRideItem;
+    ride = myRideItem;
 
     // ignore if not active or null ride
     if (!ride) {
diff --git a/src/Charts/DiaryWindow.h b/src/Charts/DiaryWindow.h
index d25972ab0..93271b251 100644
--- a/src/Charts/DiaryWindow.h
+++ b/src/Charts/DiaryWindow.h
@@ -61,6 +61,7 @@ class DiaryWindow : public GcChartWindow
 
     protected:
         Context *context;
+        RideItem *ride;
 
         QDateEdit *title;
         QPushButton *prev, *next;