diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs
index a869e887..e63a244d 100644
--- a/module/applications/ui/countdowns.mjs
+++ b/module/applications/ui/countdowns.mjs
@@ -186,6 +186,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
 
         context.userCountdownTypes = game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.userFlags.countdownTypeModes) 
             ?? [shortterm.id, longterm.id];
+
         context.typeToggles = 
             Object.values(CONFIG.DH.GENERAL.countdownType).map(type => ({
                 type: type.id,
@@ -194,6 +195,13 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
             }));
 
         context.countdowns = this._getCountdownData();
+        context.countdownTypesWithVisibleEntries = this.#getCountdowns().reduce((acc, data) => {
+            if (context.userCountdownTypes.includes(data.countdown.type) && !acc.includes(data.countdown.type)) 
+                acc.push(data.countdown.type);
+
+            return acc;
+        }, []);
+        
 
         return context;
     }
diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less
index 72f464b9..fc027c5b 100644
--- a/styles/less/ui/countdown/countdown.less
+++ b/styles/less/ui/countdown/countdown.less
@@ -106,6 +106,10 @@
         max-height: 312px;
 
         .countdown-category-container {
+            display: flex;
+            flex-direction: column;
+            gap: 8px;
+            
             &.hidden {
                 display: none;
             }
@@ -117,7 +121,7 @@
             border-radius: 6px;
 
             &.change-glow {
-                animation: shimmer 1s ease-in-out;
+                animation: shimmer 1s ease-in-out infinite;
                 background: linear-gradient(-45deg, transparent 30%, light-dark(@dark-blue-40, @golden-40) 35%, transparent 40%);
                 background-size: 300%;
                 background-position-x: 100%
diff --git a/templates/ui/countdowns/parts/countdowns.hbs b/templates/ui/countdowns/parts/countdowns.hbs
index df766113..87c1e253 100644
--- a/templates/ui/countdowns/parts/countdowns.hbs
+++ b/templates/ui/countdowns/parts/countdowns.hbs
@@ -1,5 +1,5 @@
 {{#each countdowns as | category key |}}
-    <div class="countdown-category-container {{#unless (includes @root.userCountdownTypes key)}}hidden{{/unless}}">
+    <div class="countdown-category-container {{#unless (includes @root.countdownTypesWithVisibleEntries key)}}hidden{{/unless}}">
         {{#each category as |countdown id|}}
             <div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}" data-countdown="{{id}}">
                 <div class="countdown-main-container">