diff --git a/webapp/templates/jury/partials/submission_diff.html.twig b/webapp/templates/jury/partials/submission_diff.html.twig
index c991494b33..55953736f9 100644
--- a/webapp/templates/jury/partials/submission_diff.html.twig
+++ b/webapp/templates/jury/partials/submission_diff.html.twig
@@ -27,22 +27,23 @@
     {%- endfor %}
     {%- for file in oldFileStats.unchangedfiles %}
         <li class="nav-item">
-            <a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
-               href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
+            <a class="nav-link {% if loop.first and oldFileStats.changedfiles == [] %}active{% endif %}"
+               data-bs-toggle="tab" href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
         </li>
     {%- endfor %}
     {%- for file in oldFileStats.addedfiles %}
         <li class="nav-item">
-            <a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
-               href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
+            <a class="nav-link {% if loop.first and oldFileStats.changedfiles == [] and oldFileStats.addedfiles == [] %}active{% endif %}"
+               data-bs-toggle="tab" href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
         </li>
     {%- endfor %}
 
 </ul>
 <div class="tab-content source-tab">
     {%- for filePair in oldFileStats.changedfiles %}
-        <div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
-             role="tabpanel">
+        <div class="tab-pane fade
+                    {% if loop.first %}show active{% endif %}"
+             id="diff-{{ filePair.1.submitfileid }}" role="tabpanel">
             {% set diff_id = "diff" ~  filePair.1.submitfileid %}
             <div class="mb-1">
                 <a class="btn btn-secondary btn-sm"
@@ -67,8 +68,9 @@
         </div>
     {%- endfor %}
     {%- for file in oldFileStats.unchangedfiles %}
-        <div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
-             role="tabpanel">
+        <div class="tab-pane fade
+                    {% if loop.first and (oldFileStats.changedfiles == []) %}show active{% endif %}"
+             id="diff-{{ file.submitfileid }}" role="tabpanel">
             <div class="mb-1">
                 <a class="btn btn-secondary btn-sm"
                    href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
@@ -81,11 +83,13 @@
                     </a>
                 {% endif %}
             </div>
+            {{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
         </div>
     {%- endfor %}
     {%- for file in oldFileStats.addedfiles %}
-        <div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
-             role="tabpanel">
+        <div class="tab-pane fade
+                    {% if loop.first and (oldFileStats.changedfiles == []) and (oldFileStats.addedfiles == []) %}show active{% endif %}"
+             id="diff-{{ file.submitfileid }}" role="tabpanel">
             <div class="mb-1">
                 <a class="btn btn-secondary btn-sm"
                    href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
@@ -98,6 +102,7 @@
                     </a>
                 {% endif %}
             </div>
+            {{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
         </div>
     {%- endfor %}
 </div>
diff --git a/webapp/templates/jury/submission_source.html.twig b/webapp/templates/jury/submission_source.html.twig
index 2178173b03..7e5ed75522 100644
--- a/webapp/templates/jury/submission_source.html.twig
+++ b/webapp/templates/jury/submission_source.html.twig
@@ -41,7 +41,9 @@
         <p><a href="#origdiff">Go to diff to original submission</a></p>
     {%- endif %}
 
-    {% if not oldSubmission %}
+    {%- if oldSubmission %}
+        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFiles: oldFiles, oldFileStats: oldFileStats} %}
+    {% else %}
         <ul class="nav nav-tabs source-tab-nav">
             {%- for file in files %}
                 <li class="nav-item">
@@ -74,10 +76,6 @@
         </div>
     {% endif %}
 
-    {%- if oldSubmission is not null %}
-        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFiles: oldFiles, oldFileStats: oldFileStats} %}
-    {%- endif %}
-
     {%- if originalSubmission is not null %}
         <h2 id="origdiff" class="mt-3">
             Diff to original submission