diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt
index 037e8d121756..856acd5a14f4 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt
@@ -2508,7 +2508,10 @@ open class JBTabsImpl(
       forcedRelayout = forced
     }
     if (moreToolbar != null) {
-      moreToolbar.component.isVisible = !isHideTabs && effectiveLayout!!.isScrollable
+      moreToolbar.component.isVisible = !isHideTabs && visibleInfos.isNotEmpty() && effectiveLayout!!.isScrollable
+    }
+    if (entryPointToolbar != null) {
+      entryPointToolbar!!.component.isVisible = !isHideTabs && visibleInfos.isNotEmpty()
     }
     revalidateAndRepaint(layoutNow)
   }
@@ -2593,9 +2596,6 @@ open class JBTabsImpl(
     }
 
     this.hideTabs = hideTabs
-    if (entryPointToolbar != null) {
-      entryPointToolbar!!.component.isVisible = !this.hideTabs
-    }
     relayout(forced = true, layoutNow = false)
   }