diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxContainer.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxContainer.tsx
index 489a8e2842..db4a7b99fa 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxContainer.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxContainer.tsx
@@ -76,7 +76,7 @@ const TabsBoxContainer: React.FC<FlexibleTabsProps> = ({ tabs, multipleRows, cla
   return (
     <div ref={containerRef} className={s(style, { tabContainer: true, multipleRows }, className)}>
       {tabs.map((tabContent, index) => (
-        <div key={tabContent?.toString()} className={s(style, { expand: expandIndices.has(index) })}>
+        <div key={tabContent?.toString()} className={s(style, { expand: multipleRows &&expandIndices.has(index) })}>
           {tabContent}
         </div>
       ))}
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx
index d2c20de00a..b26ca2fc96 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx
@@ -68,11 +68,11 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
         <TabsBox
           currentTabId={tab.handlerState.pageId}
           tabsClassName={s(style, { tabs: true })}
-          tabs={pages.map(page => (
+          tabs={pages.length > 1 ? pages.map(page => (
             <SContext key={page.key} registry={tabsRegistry}>
               <DBObjectPageTab tab={tab} page={page} onSelect={dbObjectPagesService.selectPage} />
             </SContext>
-          ))}
+          )) : []}
           localState={innerTabState}
         >
           {pages.map(page => (
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/shared/ObjectViewerPanelTab.module.css b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/shared/ObjectViewerPanelTab.module.css
index fdcfaf9a58..c21142798d 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/shared/ObjectViewerPanelTab.module.css
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/shared/ObjectViewerPanelTab.module.css
@@ -8,8 +8,4 @@
 
 .tab {
   composes: theme-ripple theme-background-surface theme-text-text-primary-on-light from global;
-}
-
-.tabOuter:only-child {
-  display: none;
-}
+}
\ No newline at end of file