diff --git a/packages/designer/src/toolbar/toolbar.tsx b/packages/designer/src/toolbar/toolbar.tsx
index 17ea7b19..114fdd4d 100644
--- a/packages/designer/src/toolbar/toolbar.tsx
+++ b/packages/designer/src/toolbar/toolbar.tsx
@@ -60,7 +60,7 @@ export function Toolbar({ children }: ToolbarProps) {
       <Group display="flex" alignItems="center" gap="m">
         {centerTools}
       </Group>
-      <Group display="flex" alignItems="center" gap="m">
+      <Group display="flex" alignItems="center" justifyContent="flex-end" gap="m">
         {rightTools}
       </Group>
     </Box>
diff --git a/packages/ui/src/action.tsx b/packages/ui/src/action.tsx
index a54ff64b..b1b266ca 100644
--- a/packages/ui/src/action.tsx
+++ b/packages/ui/src/action.tsx
@@ -14,6 +14,7 @@ const actionStyle = css`
   border-radius: var(--tango-radii-s);
   color: var(--tango-colors-text2);
   background-color: transparent;
+  white-space: nowrap;
 
   &:hover {
     background-color: var(--tango-colors-fill2);