diff --git a/newdle/client/src/components/GridCommon.module.scss b/newdle/client/src/components/GridCommon.module.scss
index 0285b2b4..d28cc9e4 100644
--- a/newdle/client/src/components/GridCommon.module.scss
+++ b/newdle/client/src/components/GridCommon.module.scss
@@ -39,11 +39,24 @@
 .answer-grid {
   overflow-x: auto;
   max-width: max-content;
+  max-height: 580px;
+
+  thead tr > th {
+    position: sticky !important;
+    top: 0;
+    z-index: 1;
+  }
+
+  tfoot tr > th {
+    position: sticky !important;
+    bottom: 0;
+    z-index: 1;
+  }
 
   th:first-child {
     position: sticky !important;
     left: 0;
-    z-index: 1;
+    z-index: 2;
   }
 
   tr:not(.spacer) td:first-child {