diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 55bbcea60be5..b57ce6c11530 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -931,10 +931,28 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
             </Tooltip>
           )}
           <div
-            className={`flex min-w-12 justify-end ${
+            className={`flex min-w-12 items-center justify-end gap-1 ${
               isRemoteThread ? "max-sm:min-w-24" : "max-sm:min-w-20"
             }`}
           >
+            {showsRemoteThreadIcon && (
+              <Tooltip>
+                <TooltipTrigger
+                  render={
+                    <span
+                      aria-label={threadEnvironmentLabel ?? "Remote"}
+                      className={`inline-flex shrink-0 items-center justify-center ${
+                        isConfirmingArchive ? "invisible" : ""
+                      }`}
+                      data-legacy-sidebar-unscaled-content
+                    />
+                  }
+                >
+                  <CloudIcon className="size-3 text-muted-foreground/40" />
+                </TooltipTrigger>
+                <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
+              </Tooltip>
+            )}
             {isConfirmingArchive ? (
               <button
                 ref={handleConfirmArchiveRef}
@@ -986,26 +1004,8 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                 </Tooltip>
               )
             ) : null}
-            <span
-              className={`${threadMetaClassName}${showsRemoteThreadIcon ? " flex items-center" : ""}`}
-            >
+            <span className={threadMetaClassName}>
               <span className="inline-flex items-center gap-1">
-                {showsRemoteThreadIcon && (
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={
-                        <span
-                          aria-label={threadEnvironmentLabel ?? "Remote"}
-                          className="inline-flex items-center justify-center"
-                          data-legacy-sidebar-unscaled-content
-                        />
-                      }
-                    >
-                      <CloudIcon className="size-3 text-muted-foreground/40" />
-                    </TooltipTrigger>
-                    <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
-                  </Tooltip>
-                )}
                 {jumpLabel ? (
                   hasActiveAnnotation && thread.annotation ? (
                     <ThreadAnnotationHoverPopover