diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/ScrollableSingleRowLayout.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/ScrollableSingleRowLayout.java
index 4661611f1f2a..098fe956736a 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/ScrollableSingleRowLayout.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/ScrollableSingleRowLayout.java
@@ -80,7 +80,7 @@ public class ScrollableSingleRowLayout extends SingleRowLayout {
   protected void recomputeToLayout(SingleRowPassInfo data) {
     calculateRequiredLength(data);
     clampScrollOffsetToBounds(data);
-    if (myScrollSelectionInViewPending || !data.layoutSize.equals(myLastSingRowLayout.layoutSize)) {
+    if (myScrollSelectionInViewPending || myLastSingRowLayout == null || !data.layoutSize.equals(myLastSingRowLayout.layoutSize)) {
       myScrollSelectionInViewPending = false;
       doScrollSelectionInView(data);
     }