diff --git a/chrome/browser/ui/views/tabs/vertical/vertical_tab_strip_view.cc b/chrome/browser/ui/views/tabs/vertical/vertical_tab_strip_view.cc
index 65054b1..ec8f51a9 100644
--- a/chrome/browser/ui/views/tabs/vertical/vertical_tab_strip_view.cc
+++ b/chrome/browser/ui/views/tabs/vertical/vertical_tab_strip_view.cc
@@ -69,6 +69,11 @@
   }
   views::View* view() { return view_; }
 
+  // Returns true if the tracked view height matches its preferred height.
+  bool IsViewAtPreferredHeight() {
+    return view_->size().height() == view_->GetPreferredSize().height();
+  }
+
   // Sets a callback that is run when the tracked view's height reaches its
   // preferred height.
   void SetOnReachedPreferredHeightCallback(
@@ -80,8 +85,7 @@
  private:
   void CheckTrackedViewHeight() {
     CHECK(view_);
-    if ((view_->size().height() == view_->GetPreferredSize().height()) &&
-        on_reached_preferred_height_cb_) {
+    if (IsViewAtPreferredHeight() && on_reached_preferred_height_cb_) {
       std::move(on_reached_preferred_height_cb_).Run();
     }
   }
@@ -465,10 +469,16 @@
     // (i.e. it was activated as it is being animated in). In such a case
     // disable overflow visuals to prevent jank that can occur if content view
     // bounds are changed in quick succession.
-    DisableOverflowVisuals(scroll_view);
-    activated_view_tracker_->SetOnReachedPreferredHeightCallback(
-        base::BindOnce(&VerticalTabStripView::EnableOverflowVisuals,
-                       base::Unretained(this), scroll_view));
+    if (!activated_view_tracker_->IsViewAtPreferredHeight()) {
+      DisableOverflowVisuals(scroll_view);
+      activated_view_tracker_->SetOnReachedPreferredHeightCallback(
+          base::BindOnce(&VerticalTabStripView::
+                             EnsureVisibleInViewportPostActivationAndLayout,
+                         base::Unretained(this), scroll_view));
+    } else {
+      // Always exit with overflow visuals enabled.
+      EnableOverflowVisuals(scroll_view);
+    }
     return;
   }