diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
index 5c0b49a46a32..04d6545990c9 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
@@ -61,12 +61,13 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
   @NotNull
   public final FrameDiffTool.ToolbarComponents init() {
     onInit();
-    rediff(true);
 
     FrameDiffTool.ToolbarComponents components = new FrameDiffTool.ToolbarComponents();
     components.toolbarActions = createToolbarActions();
     components.popupActions = createPopupActions();
     components.statusPanel = getStatusPanel();
+
+    rediff(true);
     return components;
   }