diff --git a/webapp/public/js/domjudge.js b/webapp/public/js/domjudge.js
index 2f7327fe23..1a0f613d8a 100644
--- a/webapp/public/js/domjudge.js
+++ b/webapp/public/js/domjudge.js
@@ -1291,7 +1291,7 @@ function loadSubmissions(dataElement, $displayElement) {
                     $item.find('[data-verdict]').html(submission.verdict);
                     $submissionList.append($item);
                 }
-                $displayElement.find('.spinner-border').remove();
+                $displayElement.find('.submissions-loading').remove();
                 $displayElement.append($table);
             }
         });
diff --git a/webapp/public/style_domjudge.css b/webapp/public/style_domjudge.css
index 6bfb441afc..36a700c4f6 100644
--- a/webapp/public/style_domjudge.css
+++ b/webapp/public/style_domjudge.css
@@ -758,3 +758,9 @@ blockquote {
     height: 80vh;
     border: 1px solid grey;
 }
+
+.submissions-loading {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+}
diff --git a/webapp/templates/public/team_submissions.html.twig b/webapp/templates/public/team_submissions.html.twig
index faf89b9923..ddf036b6f0 100644
--- a/webapp/templates/public/team_submissions.html.twig
+++ b/webapp/templates/public/team_submissions.html.twig
@@ -13,7 +13,8 @@
         data-team-id="{{ team.externalid }}"
         data-problem-id="{{ problem.externalId }}"
         data-submissions-url="{{ path('public_submissions_data_cell', {teamId: team.externalid, problemId: problem.externalId}) }}">
-        <div class="spinner-border" role="status">
+        <div class="submissions-loading">
+            <div class="spinner-border" role="status"></div>
             <span class="sr-only">Loading...</span>
         </div>
         {% include 'public/partials/submission_list_template.html.twig' %}
diff --git a/webapp/templates/public/team_submissions_modal.html.twig b/webapp/templates/public/team_submissions_modal.html.twig
index 2aac4ccf32..6f1c7b85c3 100644
--- a/webapp/templates/public/team_submissions_modal.html.twig
+++ b/webapp/templates/public/team_submissions_modal.html.twig
@@ -9,7 +9,8 @@
 {% endblock %}
 
 {% block content %}
-    <div class="spinner-border" role="status">
+    <div class="submissions-loading">
+        <div class="spinner-border" role="status"></div>
         <span class="sr-only">Loading...</span>
     </div>
 {% endblock %}