diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25bb93d12..f73e34f0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 ### Changed
 
 ### Fixed
+- Fixed various keyboard navigation issues
+- Fix cron job warning notification layout on NC25
 
 # Releases
 ## [19.0.0-beta1] - 2022-10-22
diff --git a/templates/part.content.warnings.php b/templates/part.content.warnings.php
index e8578b299..37cf1af9d 100644
--- a/templates/part.content.warnings.php
+++ b/templates/part.content.warnings.php
@@ -1,25 +1,27 @@
 <?php if ($_['warnings']['improperlyConfiguredCron']) { ?>
     <news-instant-notification id="cron-warning">
-        <p><?php p($l->t('Ajax or webcron mode detected! Your feeds will not be updated!')); ?></p>
-        <ul>
-            <li>
-                <a href="https://docs.nextcloud.org/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#cron"
-                   target="_blank"
-                   rel="noreferrer">
-                    <?php
-                    p($l->t('How to set up the operating system cron'));
-                    ?>
-                </a>
-            </li>
-            <li>
-                <a href="https://github.com/nextcloud/news-updater"
-                   target="_blank"
-                   rel="noreferrer">
-                    <?php
-                    p($l->t('Install and set up a faster parallel updater that uses the News app\'s update API'));
-                    ?>
-                </a>
-            </li>
-        </ul>
+        <div style="<?= $_['nc_major_version'] >= 25 ? 'padding: 12px;' : ''; ?>">
+            <p><?php p($l->t('Ajax or webcron mode detected! Your feeds will not be updated!')); ?></p>
+            <ul>
+                <li>
+                    <a href="https://docs.nextcloud.org/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#cron"
+                    target="_blank"
+                    rel="noreferrer">
+                        <?php
+                        p($l->t('How to set up the operating system cron'));
+                        ?>
+                    </a>
+                </li>
+                <li>
+                    <a href="https://github.com/nextcloud/news-updater"
+                    target="_blank"
+                    rel="noreferrer">
+                        <?php
+                        p($l->t('Install and set up a faster parallel updater that uses the News app\'s update API'));
+                        ?>
+                    </a>
+                </li>
+            </ul>
+        </div>
     </news-instant-notification>
 <?php }; ?>