diff --git a/module/Frontpage/src/Service/Frontpage.php b/module/Frontpage/src/Service/Frontpage.php
index acf43451c7..8cc6c2e357 100644
--- a/module/Frontpage/src/Service/Frontpage.php
+++ b/module/Frontpage/src/Service/Frontpage.php
@@ -24,6 +24,8 @@
 use function abs;
 use function array_merge;
 use function array_slice;
+use function count;
+use function shuffle;
 use function usort;
 
 /**
@@ -88,7 +90,7 @@ public function getHomePageData(): array
         $poll = $this->pollService->getNewestPoll();
         $pollDetails = $this->pollService->getPollDetails($poll);
         $pollDetails['poll'] = $poll;
-        $news = $this->getNewsItems();
+        $news = $this->getNewsItems($activities);
         $companyBanner = $this->companyService->getCurrentBanner();
 
         return [
@@ -145,31 +147,32 @@ public function getBirthdayInfo(): array
      * Returns a mixed array of news items and activities to display in the
      * news section.
      *
+     * @param ActivityModel[] $activities
+     *
      * @return array<array-key, ActivityModel|NewsItemModel>
      */
-    public function getNewsItems(): array
+    public function getNewsItems(array $activities): array
     {
         $count = $this->frontpageConfig['news_count'];
-        $activities = $this->getUpcomingActivities();
         $newsItems = $this->newsService->getLatestNewsItems($count);
-        $news = array_merge($activities, $newsItems);
-        usort($news, function ($a, $b) {
-            if (($a instanceof NewsItemModel) && ($b instanceof NewsItemModel)) {
-                if ($a->getPinned() === $b->getPinned()) {
-                    return $this->getItemTimestamp($a) - $this->getItemTimestamp($b);
-                }
-
-                return $a->getPinned() ? -1 : 1;
-            }
 
-            if (($a instanceof ActivityModel) && ($b instanceof ActivityModel)) {
+        usort($newsItems, function ($a, $b) {
+            if ($a->getPinned() === $b->getPinned()) {
                 return $this->getItemTimestamp($a) - $this->getItemTimestamp($b);
             }
 
-            return $a instanceof ActivityModel ? 1 : -1;
+            return $a->getPinned() ? -1 : 1;
         });
 
-        return array_slice($news, 0, $count);
+        $newsCount = count($newsItems);
+
+        if ($newsCount < $count) {
+            $remainingCount = $count - $newsCount;
+            shuffle($activities);
+            $newsItems = array_merge($newsItems, array_slice($activities, 0, $remainingCount));
+        }
+
+        return $newsItems;
     }
 
     /**
diff --git a/module/Frontpage/view/frontpage/frontpage/home.phtml b/module/Frontpage/view/frontpage/frontpage/home.phtml
index 6857005154..4b9103afbe 100644
--- a/module/Frontpage/view/frontpage/frontpage/home.phtml
+++ b/module/Frontpage/view/frontpage/frontpage/home.phtml
@@ -67,7 +67,15 @@ $lang = $this->plugin('translate')->getTranslator()->getLocale();
                         }
                         ?>
                         <article class="content-article">
-                            <h3><?= $this->escapeHtml($title) ?></h3>
+                            <?php if ($item instanceof ActivityModel): ?>
+                                <h3>
+                                    <a href="<?= $this->url('activity/view', ['id' => $item->getId()]) ?>">
+                                        <?= $this->escapeHtml($title) ?>
+                                    </a>
+                                </h3>
+                            <?php else: ?>
+                                <h3><?= $this->escapeHtml($title) ?></h3>
+                            <?php endif; ?>
                             <div style="position: relative; overflow: hidden;">
                                 <div class="reveal reveal-10 markdown">
                                     <?= $content ?>