diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6969eeb56194..533fa6c290e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,9 @@
 - Allow cmd-/ (Mac) or ctrl-/ (Windows) to toggle comments in the playground
   editor (@AaronMoat, #3522)
 
+- Limit maximum height of the playground editor's error panel to avoid taking
+  over whole screen (@AaronMoat, #3524)
+
 **Integrations**:
 
 **Internal changes**:
diff --git a/web/playground/src/workbench/Workbench.css b/web/playground/src/workbench/Workbench.css
index 3d7eb43e132c..157a88c1ed97 100644
--- a/web/playground/src/workbench/Workbench.css
+++ b/web/playground/src/workbench/Workbench.css
@@ -62,6 +62,9 @@
   margin: 0;
   width: 100%;
 
+  max-height: 50%;
+  overflow-y: auto;
+
   font-family: monospace;
   white-space: pre-wrap;