diff --git a/.changeset/three-pots-sit.md b/.changeset/three-pots-sit.md
new file mode 100644
index 0000000..e4e69d1
--- /dev/null
+++ b/.changeset/three-pots-sit.md
@@ -0,0 +1,5 @@
+---
+"inform-ai": patch
+---
+
+Fix scrolling overflow on Messages UI component
diff --git a/src/ui/main.css b/src/ui/main.css
index 565d873..838d84b 100644
--- a/src/ui/main.css
+++ b/src/ui/main.css
@@ -25,7 +25,7 @@
 /* Messages styles */
 @layer components {
   .iai-messages {
-    @apply flex flex-col gap-2;
+    @apply flex flex-col gap-2 overflow-y-auto;
 
     .user-message {
       @apply flex justify-end;