diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp
index 03124a425..0a9c0297f 100644
--- a/src/toolbars/SelectionBar.cpp
+++ b/src/toolbars/SelectionBar.cpp
@@ -676,12 +676,15 @@ void SelectionBar::ValuesToControls()
 // A time has been set.  Update the control values.
 void SelectionBar::SetTimes(double start, double end, double audio)
 {
-   if ( start != mStart || end != mEnd || audio != mAudio) {
+   if ( start != mStart || end != mEnd || audio != mAudio
+      || mLastSelectionMode != mSelectionMode
+   ) {
       mStart = start;
       mEnd = end;
       mLength = end-start;
       mCenter = (end+start)/2.0;
       mAudio = audio;
+      mLastSelectionMode = mSelectionMode;
 
       ValuesToControls();
    }
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index 0404d5796..415c285d3 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -94,7 +94,8 @@ class SelectionBar final : public ToolBar {
    int mDrive1;
    int mDrive2;
 
-   int mSelectionMode;
+   int mSelectionMode{ 0 };
+   int mLastSelectionMode{ 0 };
 
    NumericTextCtrl   *mStartTime;
    NumericTextCtrl   *mCenterTime;