diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
index 30e0e6bd5f..ed3f3b307a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.TimeZone;
 import java.util.concurrent.ExecutionException;
@@ -344,6 +345,9 @@ public class TimeLineController {
                 filteredEvents.filterProperty().get(),
                 DescriptionLoD.SHORT);
         historyManager.advance(InitialZoomState);
+
+        //clear the selected events when the view mode changes
+        viewMode.addListener(observable -> selectEventIDs(Collections.emptySet()));
     }
 
     /**