diff --git a/mo/web/templates/org_contest.html b/mo/web/templates/org_contest.html
index d5540acd8bed25618a30f1c9e115baedfbdff5fc..6bf9c8cc4921ca164d54e29e1217f37ae46e9d5f 100644
--- a/mo/web/templates/org_contest.html
+++ b/mo/web/templates/org_contest.html
@@ -142,7 +142,7 @@
 </div>
 </div>
 {% endif %}
-{% if state != RoundState.preparing and (can_view_contestants or can_view_submits) %}
+{% if (can_view_submits and state != RoundState.preparing) or can_upload or (not site and can_view_contestants and (state == RoundState.grading or state == RoundState.closed)) %}
 <div class="col-md-5">
 <div class="panel panel-default">
     <div class="panel-heading">
@@ -155,7 +155,7 @@
         {% if can_view_submits and state != RoundState.preparing %}
         <a class="btn btn-success" href='{{ ctx.url_for('org_contest_solutions') }}'><span class="glyphicon glyphicon-th-list"></span> Tabulka řešení</a>
         {% endif %}
-        {% if not site and ((can_view_contestants and state == RoundState.grading) or state == RoundState.closed) %}
+        {% if not site and can_view_contestants and (state == RoundState.grading or state == RoundState.closed) %}
         <a class="btn btn-warning" href='{{ ctx.url_for('org_score') }}'><span class="glyphicon glyphicon-bullhorn"></span> Výsledky</a>
         {% endif %}
         {% if can_upload %}
@@ -166,6 +166,10 @@
     </div>
 </div>
 </div>
+{% elif not site and state == RoundState.closed %}
+<div class="col-md-12">
+	<a class="btn btn-lg btn-warning" href='{{ ctx.url_for('public_score') }}'><span class="glyphicon glyphicon-bullhorn"></span> Výsledky</a>
+</div>
 {% endif %}
 </div>