diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f1d28be..6acfb7e09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - The first run plugin picker no longer sets the default layout and themes to Remove. They always stay on
 - Alerts with no icon no longer squeeze their text to one word per line
 - Password fields with the show button are the same height as the other fields next to them
+- Button groups next to tabs no longer touch the lines of the tab row
 - The Secure your account setup step no longer shows up empty when no passkey or authenticator plugin is on
 - An installed plugin update older than the copy in a newer image is removed at startup instead of logging an error every boot
 - Canceling a download to the desktop app right as it starts no longer leaves a partial file behind
diff --git a/src/ui/components/tab-strip.tsx b/src/ui/components/tab-strip.tsx
index 7e87e2850..6a361090f 100644
--- a/src/ui/components/tab-strip.tsx
+++ b/src/ui/components/tab-strip.tsx
@@ -138,7 +138,7 @@ export function TabStrip({
         </button>
       )}
       {trailing && (
-        <div className="flex shrink-0 items-center gap-1 px-2 [&_[data-slot=button]]:!h-6 [&_[data-slot=button][data-size^=icon]]:!size-6 [&_[data-slot=input]]:!h-6 [&_[data-slot=select-trigger]]:!h-6">
+        <div className="flex shrink-0 items-center gap-1 px-2 [&_[data-slot=button]]:!h-6 [&_[data-slot=button][data-size^=icon]]:!size-6 [&_[data-slot=input]]:!h-6 [&_[data-slot=select-trigger]]:!h-6 [&_[data-slot=segmented]_button]:!h-[calc(1.5rem-2px)]">
           {trailing}
         </div>
       )}
diff --git a/src/ui/components/tile-grid/edge.tsx b/src/ui/components/tile-grid/edge.tsx
index 8bc2d2f1f..ea88ebf9a 100644
--- a/src/ui/components/tile-grid/edge.tsx
+++ b/src/ui/components/tile-grid/edge.tsx
@@ -98,7 +98,8 @@ export function BottomEdge({
   const ref = useRef<HTMLDivElement>(null);
   const reaches = useReachesBottom(ref);
   return (
-    <div ref={ref} className={cn("min-w-0 overflow-clip", className)}>
+    // flow-root keeps the -1px margin inside, overflow clip alone lets it escape.
+    <div ref={ref} className={cn("flow-root min-w-0 overflow-clip", className)}>
       <div
         className={cn((owned || closed || reaches) && "-mb-px", innerClassName)}
       >