diff --git a/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx
index 09cf0f050cce..fda509f0451a 100644
--- a/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx
+++ b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx
@@ -125,8 +125,8 @@ const WorkbenchTab = ({
           </Fragment>
         );
       })}
-      {!workbench.pinned && tabsLength > 1 ? (
-        <div className={styles.tabCloseButtonWrapper}>
+      <div className={styles.tabCloseButtonWrapper}>
+        {!workbench.pinned && tabsLength > 1 ? (
           <button
             data-testid="close-tab-button"
             className={styles.tabCloseButton}
@@ -134,8 +134,8 @@ const WorkbenchTab = ({
           >
             <CloseIcon />
           </button>
-        </div>
-      ) : null}
+        ) : null}
+      </div>
     </div>
   );
 };
diff --git a/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts b/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts
index 3b0384454d40..f359f00a257e 100644
--- a/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts
+++ b/packages/frontend/core/src/modules/app-tabs-header/views/styles.css.ts
@@ -148,7 +148,7 @@ export const tabCloseButtonWrapper = style({
   paddingRight: 4,
   justifyContent: 'flex-end',
   selectors: {
-    [`${tab}:is([data-active=true], :hover) &`]: {
+    [`${tab}:is([data-active=true], :hover) &:not(:empty)`]: {
       width: 40,
     },
     [`${tab}[data-active=true] &`]: {