diff --git a/datasette/templates/database.html b/datasette/templates/database.html
index 884a1c4b..d3f7a436 100644
--- a/datasette/templates/database.html
+++ b/datasette/templates/database.html
@@ -90,6 +90,11 @@
       mode: "text/x-sql",
       lineWrapping: true,
     });
+    editor.setOption("extraKeys", {
+      "Shift-Enter": function() {
+        document.getElementsByClassName("sql")[0].submit();
+      }
+    });
 </script>
 
 {% endblock %}