diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index e325c27711..680bfeb641 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -78,7 +78,7 @@
   {style}
   {draggable}
 >
-  <div class="nav-item-content" bind:this={contentRef}>
+  <div class="nav-item-content" bind:this={contentRef} class:right={rightAlignIcon}>
     {#if withArrow}
       <div
         class:opened
@@ -166,12 +166,16 @@
     justify-content: flex-start;
     align-items: center;
     gap: var(--spacing-xs);
-    width: 100%;
+    width: max-content;
     position: relative;
     padding-left: var(--spacing-l);
     box-sizing: border-box;
   }
 
+  .nav-item-content.right {
+    width: 100%;
+  }
+
   /* Needed to fully display the actions icon */
   .nav-item.scrollable .nav-item-content {
     padding-right: 1px;