diff --git a/src/assets/scss/data-table.scss b/src/assets/scss/data-table.scss
index df0503f..d5ce8f0 100644
--- a/src/assets/scss/data-table.scss
+++ b/src/assets/scss/data-table.scss
@@ -24,3 +24,8 @@
 		background-color: transparent;
 	}
 }
+
+.data-table-container {
+	overflow-x: auto;
+	max-width: 100%;
+}
diff --git a/src/assets/views/auth/account/account.svelte b/src/assets/views/auth/account/account.svelte
index c50c895..cb72f86 100644
--- a/src/assets/views/auth/account/account.svelte
+++ b/src/assets/views/auth/account/account.svelte
@@ -41,49 +41,51 @@
         <section class="panel">
             <h2 id="emails"><i data-feather="shield"></i> Email addresses</h2>
 
-            <table class="data-table">
-                <thead>
-                <tr>
-                    <th>Type</th>
-                    <th>Address</th>
-                    <th>Actions</th>
-                </tr>
-                </thead>
+            <div class="data-table-container">
+                <table class="data-table">
+                    <thead>
+                    <tr>
+                        <th>Type</th>
+                        <th>Address</th>
+                        <th>Actions</th>
+                    </tr>
+                    </thead>
 
-                <tbody>
-                {#each emails as email}
-                    {#if email.id === $locals.user.main_email_id}
-                        <tr>
-                            <td>Main</td>
-                            <td>{email.email}</td>
-                            <td></td>
-                        </tr>
-                    {/if}
-                {/each}
+                    <tbody>
+                    {#each emails as email}
+                        {#if email.id === $locals.user.main_email_id}
+                            <tr>
+                                <td>Main</td>
+                                <td>{email.email}</td>
+                                <td></td>
+                            </tr>
+                        {/if}
+                    {/each}
 
-                {#each emails as email}
-                    {#if email.id !== $locals.user.main_email_id}
-                        <tr>
-                            <td>Secondary</td>
-                            <td>{email.email}</td>
-                            <td class="actions">
-                                <Form action={$locals.route('set-main-email')} button
-                                      submitIcon="refresh-ccw" submitText="Set as main address" submitClass="warning"
-                                      confirm="Are you sure you want to set {email.email} as your main address?">
-                                    <Field type="hidden" name="id" value={email.id}/>
-                                </Form>
+                    {#each emails as email}
+                        {#if email.id !== $locals.user.main_email_id}
+                            <tr>
+                                <td>Secondary</td>
+                                <td>{email.email}</td>
+                                <td class="actions">
+                                    <Form action={$locals.route('set-main-email')} button
+                                          submitIcon="refresh-ccw" submitText="Set as main address" submitClass="warning"
+                                          confirm="Are you sure you want to set {email.email} as your main address?">
+                                        <Field type="hidden" name="id" value={email.id}/>
+                                    </Form>
 
-                                <Form action={$locals.route('remove-email')} button
-                                      submitIcon="trash" submitText="Remove" submitClass="danger"
-                                      confirm="Are you sure you want to delete {email.email}?">
-                                    <Field type="hidden" name="id" value={email.id}/>
-                                </Form>
-                            </td>
-                        </tr>
-                    {/if}
-                {/each}
-                </tbody>
-            </table>
+                                    <Form action={$locals.route('remove-email')} button
+                                          submitIcon="trash" submitText="Remove" submitClass="danger"
+                                          confirm="Are you sure you want to delete {email.email}?">
+                                        <Field type="hidden" name="id" value={email.id}/>
+                                    </Form>
+                                </td>
+                            </tr>
+                        {/if}
+                    {/each}
+                    </tbody>
+                </table>
+            </div>
 
             <Form action={$locals.route('add-email')} class="sub-panel"
                   submitIcon="plus" submitText="Add email address">
diff --git a/src/assets/views/backend/accounts_approval.svelte b/src/assets/views/backend/accounts_approval.svelte
index 4fa9ca2..982427b 100644
--- a/src/assets/views/backend/accounts_approval.svelte
+++ b/src/assets/views/backend/accounts_approval.svelte
@@ -25,7 +25,7 @@
 
     <Pagination pagination={$locals.pagination} routeName="accounts-approval" contextSize="3" />
 
-    <div class="panel">
+    <div class="panel data-table-container">
         <table class="data-table">
             <thead>
             <tr>
diff --git a/test/assets/views/AllTests.svelte b/test/assets/views/AllTests.svelte
index b0e6001..bbbf5a9 100644
--- a/test/assets/views/AllTests.svelte
+++ b/test/assets/views/AllTests.svelte
@@ -14,16 +14,18 @@
 
 <div class="render-mode">{$locals.isPreRender ? 'SSR' : 'CSR'}</div>
 
-<table>
-    <thead>
+<div class="data-table-container">
+    <table class="data-table">
+        <thead>
         <tr>
             <th>Name</th>
             <th>Expected value</th>
             <th>Actual value</th>
         </tr>
-    </thead>
+        </thead>
 
-    <tbody>
+        <tbody>
         <LocalsTest/>
-    </tbody>
-</table>
+        </tbody>
+    </table>
+</div>