diff --git a/datasette/static/app.css b/datasette/static/app.css
index 73a8c9b5..9b699a9d 100644
--- a/datasette/static/app.css
+++ b/datasette/static/app.css
@@ -41,6 +41,9 @@ table a:link {
 table a:visited {
     color: #8f54c4;
 }
+.table-wrapper {
+    overflow-x: auto;
+}
 .small-screen-only,
 .select-wrapper.small-screen-only {
     display: none;
diff --git a/datasette/static/table.js b/datasette/static/table.js
index c41fd9b0..179b42c4 100644
--- a/datasette/static/table.js
+++ b/datasette/static/table.js
@@ -50,9 +50,17 @@ var DROPDOWN_ICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="14" heig
         params.set(`${column}__notblank`, '1');
         return paramsToUrl(params);
     }
-    function isFacetedBy(column) {
-        return getParams().getAll('_facet').includes(column);
+    function closeMenu() {
+        menu.style.display = 'none';
+        menu.classList.remove('anim-scale-in');
     }
+    // When page loads, add scroll listener on .table-wrapper
+    document.addEventListener('DOMContentLoaded', () => {
+        var tableWrapper = document.querySelector('.table-wrapper');
+        if (tableWrapper) {
+            tableWrapper.addEventListener('scroll', closeMenu);
+        }
+    });
     document.body.addEventListener('click', (ev) => {
         /* was this click outside the menu? */
         var target = ev.target;
@@ -60,8 +68,7 @@ var DROPDOWN_ICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="14" heig
             target = target.parentNode;
         }
         if (!target) {
-            menu.style.display = 'none';
-            menu.classList.remove('anim-scale-in');
+            closeMenu();
         }
     });
     function iconClicked(ev) {
diff --git a/datasette/templates/_table.html b/datasette/templates/_table.html
index 1dd94212..d765937e 100644
--- a/datasette/templates/_table.html
+++ b/datasette/templates/_table.html
@@ -1,4 +1,5 @@
 {% if display_rows %}
+<div class="table-wrapper">
     <table class="rows-and-columns">
         <thead>
             <tr>
@@ -27,6 +28,7 @@
         {% endfor %}
         </tbody>
     </table>
+</div>
 {% else %}
     <p class="zero-results">0 records</p>
 {% endif %}