diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 2ec4df4bb707..c9fbeb8b2127 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -274,6 +274,10 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
 
   @CalledInAwt
   public void setHistorySession(@NotNull VcsHistorySession session) {
+    if (myTargetSelection == null) {
+      myTargetSelection = myDualView.getFlatView().getSelectedObjects();
+    }
+    
     myHistorySession = session;
     refreshRevisionsOrder();
     HistoryAsTreeProvider treeHistoryProvider = session.getHistoryAsTreeProvider();
@@ -428,7 +432,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
     ApplicationManager.getApplication().invokeAndWait(() -> {
       if (myInRefresh) return;
       myInRefresh = true;
-      myTargetSelection = myDualView.getFlatView().getSelectedObjects();
 
       mySplitter.revalidate();
       mySplitter.repaint();