diff --git a/src/components/EntityStatus/EntityStatus.scss b/src/components/EntityStatus/EntityStatus.scss
index 667862ad87..f51670c89e 100644
--- a/src/components/EntityStatus/EntityStatus.scss
+++ b/src/components/EntityStatus/EntityStatus.scss
@@ -31,7 +31,9 @@
 
         overflow: hidden;
 
-        padding-right: var(--button-width);
+        &_with-button {
+            padding-right: var(--button-width);
+        }
     }
 
     &__controls-wrapper {
diff --git a/src/components/EntityStatus/EntityStatus.tsx b/src/components/EntityStatus/EntityStatus.tsx
index 1f73a96a4f..442aac3717 100644
--- a/src/components/EntityStatus/EntityStatus.tsx
+++ b/src/components/EntityStatus/EntityStatus.tsx
@@ -90,7 +90,7 @@ export function EntityStatus({
                 </span>
             )}
             {(path || name) && (
-                <div className={b('wrapper')}>
+                <div className={b('wrapper', {'with-button': hasClipboardButton})}>
                     <span className={b('link', {'with-left-trim': withLeftTrim})}>
                         {renderLink()}
                     </span>