From b5aebaad35b0db938eb894fd4e78759932c90d03 Mon Sep 17 00:00:00 2001
From: Jon Kazama <kontakt@hellion-media.de>
Date: Thu, 21 May 2026 14:32:25 +0200
Subject: [PATCH] fix(ui): keep scroll-to-bottom button on the toolbar row

---
 HellionChat/Ui/ChatLogWindow.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/HellionChat/Ui/ChatLogWindow.cs b/HellionChat/Ui/ChatLogWindow.cs
index 54a586a..a066a77 100644
--- a/HellionChat/Ui/ChatLogWindow.cs
+++ b/HellionChat/Ui/ChatLogWindow.cs
@@ -2351,6 +2351,10 @@ public sealed class ChatLogWindow : Window
 
         if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowDown, tooltip: HellionStrings.ChatLog_ScrollToBottom_Tooltip))
             _scrollToBottomRequested = true;
+
+        // Keep the pop-out button on the same toolbar row. Without this the
+        // button item ends the line and the pop-out drops to the next row.
+        ImGui.SameLine();
     }
 
     private void DrawPopOutButton(Tab tab)