diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index ccc57ff..feecdca 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -169,7 +169,7 @@ class ContestsController < ApplicationController
   end
 
   def scoreboard
-    if active_page("/public/event")
+    if active_page("/public/event/") == "active"
       @event = Event.find_by(slug: params[:id])
       unless @event && @event.shared_scoreboard && !@event.contests.where(public: true).empty?
         skip_authorization
diff --git a/app/views/contests/index.html.slim b/app/views/contests/index.html.slim
index 89cd6a6..72c1a2e 100644
--- a/app/views/contests/index.html.slim
+++ b/app/views/contests/index.html.slim
@@ -2,6 +2,8 @@
   .col
     h4.mb-3
       = t("contests.index.manage_contests")
+      a.ms-3.btn.btn-primary href="/events"
+        = t("events.show.back_to_events")
       .float-end
         a.btn.btn-primary.mb-4 href=new_contest_path
           = t("contests.index.new_contest")
@@ -9,7 +11,7 @@
 .alert.alert-primary role="alert"
   = t("contests.index.message")
 
-.row.row-cols-1.row-cols-md-3.g-4
+.mt-3.row.row-cols-1.row-cols-md-3.g-4
   - @contests.each do |contest|
     .col
       css:
diff --git a/app/views/layouts/authenticated.html.slim b/app/views/layouts/authenticated.html.slim
index d8bbee9..b96291c 100644
--- a/app/views/layouts/authenticated.html.slim
+++ b/app/views/layouts/authenticated.html.slim
@@ -91,12 +91,20 @@ html
                   startAutoRefresh(200);
           - elsif active_page("/contests") == "active"
             = @contest.name
-            - if @contest.public
-              a.ms-4.btn.btn-success href="/public/#{@contest.slug}" style="margin-top: -6px;"
-                = t("contests.show.open_public_scoreboard")
+            - if @contest.event && @contest.event.shared_scoreboard
+              - if @contest.public
+                a.ms-4.btn.btn-success href="/public/event/#{@contest.event.slug}?contest_id=#{@contest.id}" style="margin-top: -6px;"
+                  = t("events.show.open_shared_scoreboard")
+              - else
+                a.ms-4.btn.btn-success.disabled style="margin-top: -6px;"
+                  = t("contests.show.shared_scoreboard_disabled")
             - else
-              a.ms-4.btn.btn-success.disabled style="margin-top: -6px;"
-                = t("contests.show.public_scoreboard_disabled")
+              - if @contest.public
+                a.ms-4.btn.btn-success href="/public/#{@contest.slug}" style="margin-top: -6px;"
+                  = t("contests.show.open_public_scoreboard")
+              - else
+                a.ms-4.btn.btn-success.disabled style="margin-top: -6px;"
+                  = t("contests.show.public_scoreboard_disabled")
           - else
             = @contest.name
         - else
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2bd7584..bbd45ff 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -247,6 +247,7 @@ en:
       open_public_scoreboard: Open public scoreboard
       offline_form_disabled: The offline form is disabled
       public_scoreboard_disabled: The public scoreboard is disabled
+      shared_scoreboard_disabled: The public scoreboard is disabled for this contest
       url_copied: URL copied to the clipboard
     stopwatch:
       info: This stopwatch is used for display in the public scoreboard, when allowed in the settings
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8e8d355..a53069a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -218,6 +218,7 @@ fr:
       open_public_scoreboard: Ouvrir le classement public
       offline_form_disabled: Le formulaire hors-ligne n'est pas activé
       public_scoreboard_disabled: Le classement public n'est pas activé
+      shared_scoreboard_disabled: Le classement public n'est pas activé pour cette épreuve
       url_copied: L’URL a été copiée dans le presse-papier
     stopwatch:
       info: Ce chronomètre est utilisé pour être affiché dans le classement public, quand autorisé dans les paramètres