diff --git a/gui/src/components/StyledMarkdownPreview/index.tsx b/gui/src/components/StyledMarkdownPreview/index.tsx
index 2ff217a6147..be30d60ebda 100644
--- a/gui/src/components/StyledMarkdownPreview/index.tsx
+++ b/gui/src/components/StyledMarkdownPreview/index.tsx
@@ -66,8 +66,8 @@ const StyledMarkdown = styled.div<{
     background-color: ${vscEditorBackground};
     border-radius: ${defaultBorderRadius};
 
-    max-width: calc(100vw - 24px);
-    overflow-x: scroll;
+    max-width: 100%;
+    overflow-x: auto;
     overflow-y: hidden;
 
     padding: 8px;
diff --git a/gui/src/components/UnifiedTerminal/UnifiedTerminal.tsx b/gui/src/components/UnifiedTerminal/UnifiedTerminal.tsx
index e8b240fdd7e..3296e7c942b 100644
--- a/gui/src/components/UnifiedTerminal/UnifiedTerminal.tsx
+++ b/gui/src/components/UnifiedTerminal/UnifiedTerminal.tsx
@@ -88,8 +88,8 @@ const StyledTerminalContainer = styled.div<{
 const TerminalContent = styled.div`
   pre {
     white-space: pre-wrap;
-    max-width: calc(100vw - 24px);
-    overflow-x: scroll;
+    max-width: 100%;
+    overflow-x: auto;
     overflow-y: hidden;
     padding: 8px;
     margin: 0;
diff --git a/gui/src/components/mainInput/Lump/LumpToolbar/PendingToolCallToolbar.tsx b/gui/src/components/mainInput/Lump/LumpToolbar/PendingToolCallToolbar.tsx
index 7b08c6eaf96..7bdcc8e69a6 100644
--- a/gui/src/components/mainInput/Lump/LumpToolbar/PendingToolCallToolbar.tsx
+++ b/gui/src/components/mainInput/Lump/LumpToolbar/PendingToolCallToolbar.tsx
@@ -36,17 +36,17 @@ export function PendingToolCallToolbar() {
   };
 
   return (
-    <div className="flex w-full flex-col pb-0.5">
+    <div className="flex w-full min-w-0 flex-col pb-0.5">
       {pendingToolCalls.map((toolCall, index) => (
         <div
           key={toolCall.toolCallId}
-          className="border-input bg-input flex items-center gap-2 rounded border"
+          className="border-input bg-input grid min-w-0 grid-cols-[minmax(0,1fr)_auto] items-center rounded border"
         >
-          <span className="text-description flex-1 truncate text-xs italic">
+          <span className="text-description truncate px-1 text-xs italic">
             {toolCall.tool?.displayTitle ?? toolCall.toolCall.function.name}
           </span>
 
-          <div className="flex items-center gap-1">
+          <div className="flex items-center gap-1 pr-1">
             <Button
               variant="ghost"
               size="sm"
diff --git a/gui/src/components/mainInput/Lump/index.tsx b/gui/src/components/mainInput/Lump/index.tsx
index d437c828a15..24e2be38688 100644
--- a/gui/src/components/mainInput/Lump/index.tsx
+++ b/gui/src/components/mainInput/Lump/index.tsx
@@ -5,8 +5,8 @@ import { LumpToolbar } from "./LumpToolbar/LumpToolbar";
  */
 export function Lump() {
   return (
-    <div className="bg-input rounded-t-default border-command-border mx-1.5 border-l border-r border-t">
-      <div className="xs:px-2 px-1 py-0.5">
+    <div className="bg-input rounded-t-default border-command-border mx-1 min-w-0 overflow-hidden border-l border-r border-t">
+      <div className="min-w-0 px-1 py-0.5">
         <LumpToolbar />
       </div>
     </div>
diff --git a/gui/src/pages/gui/Chat.tsx b/gui/src/pages/gui/Chat.tsx
index 00e04efd1f4..e84d7980475 100644
--- a/gui/src/pages/gui/Chat.tsx
+++ b/gui/src/pages/gui/Chat.tsx
@@ -46,10 +46,9 @@ import { ToolCallDiv } from "./ToolCallDiv";
 import { useStore } from "react-redux";
 import FeedbackDialog from "../../components/dialogs/FeedbackDialog";
 
-import { DeprecationBanner } from "../../components/DeprecationBanner";
 import { FatalErrorIndicator } from "../../components/config/FatalErrorNotice";
+import { DeprecationBanner } from "../../components/DeprecationBanner";
 import InlineErrorMessage from "../../components/mainInput/InlineErrorMessage";
-import { resolveEditorContent } from "../../components/mainInput/TipTapEditor/utils/resolveEditorContent";
 import { setDialogMessage, setShowDialog } from "../../redux/slices/uiSlice";
 import { RootState } from "../../redux/store";
 import { cancelStream } from "../../redux/thunks/cancelStream";
@@ -71,6 +70,7 @@ function findLatestSummaryIndex(history: ChatHistoryItem[]): number {
 const StepsDiv = styled.div`
   position: relative;
   background-color: transparent;
+  overflow-x: hidden;
 
   & > * {
     position: relative;
diff --git a/gui/src/pages/gui/index.tsx b/gui/src/pages/gui/index.tsx
index d74b32c59c7..4ddcc0bca26 100644
--- a/gui/src/pages/gui/index.tsx
+++ b/gui/src/pages/gui/index.tsx
@@ -7,7 +7,7 @@ export default function GUI() {
       <aside className="4xl:flex border-vsc-input-border no-scrollbar hidden min-h-0 w-96 overflow-y-auto border-0 border-r border-solid">
         <History />
       </aside>
-      <main className="no-scrollbar flex min-h-0 flex-1 flex-col">
+      <main className="no-scrollbar flex min-h-0 min-w-0 flex-1 flex-col">
         <Chat />
       </main>
     </div>