diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
index c7c32bf..7466f8c 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
@@ -19,19 +19,21 @@
             </button>
         </div>
     </div>
-    <table class="ez-table table">
-        <thead>
-        <tr>
-            <th></th>
-            {% for column in columns %}
-                <th data-identifier="{{ column['identifier'] }}">{{ column['name'] }}</th>
-            {% endfor %}
-        </tr>
-        </thead>
-        <tbody class="ez-table__body" data-minimum-rows="{{ minimum_rows }}" data-next-index="{{ form.entries.children|length ? max(form.entries.children|keys) + 1 : 0 }}">
-            {{ form_widget(form) }}
-        </tbody>
-    </table>
+    <div class="ez-scrollable-table-wrapper">
+        <table class="ez-table table">
+            <thead>
+            <tr>
+                <th></th>
+                {% for column in columns %}
+                    <th data-identifier="{{ column['identifier'] }}">{{ column['name'] }}</th>
+                {% endfor %}
+            </tr>
+            </thead>
+            <tbody class="ez-table__body" data-minimum-rows="{{ minimum_rows }}" data-next-index="{{ form.entries.children|length ? max(form.entries.children|keys) + 1 : 0 }}">
+                {{ form_widget(form) }}
+            </tbody>
+        </table>
+    </div>
 {% endblock %}
 
 {% block ezplatform_fieldtype_ezmatrix_entry_row %}
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
index 2201d41..ee12396 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
@@ -2,22 +2,24 @@
     {% set columnsSettings = fieldSettings['columns'] %}
     {% set fieldData = field.value.rows %}
 
-    <table class="ez-table table">
-        <thead>
+    <div class="ez-scrollable-table-wrapper">
+        <table class="ez-table table">
+            <thead>
+                <tr>
+                    {% for column in columnsSettings %}
+                        <th>{{ column['name'] }}</th>
+                    {% endfor %}
+                </tr>
+            </thead>
+            <tbody>
+            {% for data in fieldData %}
             <tr>
                 {% for column in columnsSettings %}
-                    <th>{{ column['name'] }}</th>
+                    <td>{{ data.cells[column['identifier']]|default }}</td>
                 {% endfor %}
             </tr>
-        </thead>
-        <tbody>
-        {% for data in fieldData %}
-        <tr>
-            {% for column in columnsSettings %}
-                <td>{{ data.cells[column['identifier']]|default }}</td>
             {% endfor %}
-        </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+            </tbody>
+        </table>
+    </div>
 {% endblock %}