diff --git a/module/applications/ui/countdownEdit.mjs b/module/applications/ui/countdownEdit.mjs
index e292a405..a5980146 100644
--- a/module/applications/ui/countdownEdit.mjs
+++ b/module/applications/ui/countdownEdit.mjs
@@ -35,7 +35,7 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio
     static PARTS = {
         countdowns: {
             template: 'systems/daggerheart/templates/ui/countdown-edit.hbs',
-            scrollable: ['.expanded-view']
+            scrollable: ['.expanded-view', '.edit-content']
         }
     };
 
diff --git a/styles/less/ui/countdown/countdown-edit.less b/styles/less/ui/countdown/countdown-edit.less
index 07ca75ec..b675d9e2 100644
--- a/styles/less/ui/countdown/countdown-edit.less
+++ b/styles/less/ui/countdown/countdown-edit.less
@@ -57,6 +57,11 @@
             display: flex;
             flex-direction: column;
             gap: 8px;
+            overflow-y: auto;
+            overflow-x: hidden;
+            max-height: 500px;
+            scrollbar-width: thin;
+            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
             .countdown-edit-container {
                 display: grid;
diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less
index d4207ba7..9fa42ec7 100644
--- a/styles/less/ui/countdown/countdown.less
+++ b/styles/less/ui/countdown/countdown.less
@@ -45,6 +45,8 @@
     .window-content {
         padding-top: 4px;
         padding-bottom: 16px;
+        overflow: auto;
+        max-height: 312px;
 
         .countdowns-container {
             display: flex;