diff --git a/datasette/templates/query.html b/datasette/templates/query.html
index 911119bb..78a1c123 100644
--- a/datasette/templates/query.html
+++ b/datasette/templates/query.html
@@ -59,8 +59,8 @@
 </form>
 
 {% if display_rows %}
-  <p class="export-links">This data as {% for name, url in renderers.items() %}<a href="{{ url }}">{{ name }}</a>{{ ", " if not loop.last }}{% endfor %}, <a href="{{ url_csv }}">CSV</a></p>
-<table class="rows-and-columns">
+<p class="export-links">This data as {% for name, url in renderers.items() %}<a href="{{ url }}">{{ name }}</a>{{ ", " if not loop.last }}{% endfor %}, <a href="{{ url_csv }}">CSV</a></p>
+<div class="table-wrapper"><table class="rows-and-columns">
     <thead>
         <tr>
             {% for column in columns %}<th class="col-{{ column|to_css_class }}" scope="col">{{ column }}</th>{% endfor %}
@@ -75,7 +75,7 @@
         </tr>
     {% endfor %}
     </tbody>
-</table>
+</table></div>
 {% else %}
     {% if not canned_write %}
         <p class="zero-results">0 results</p>