diff --git a/lib/riemann/dash/public/views/grid.js b/lib/riemann/dash/public/views/grid.js
index 73a9375..37399f3 100644
--- a/lib/riemann/dash/public/views/grid.js
+++ b/lib/riemann/dash/public/views/grid.js
@@ -50,8 +50,8 @@
   Grid.prototype.editForm = function() {
     return Mustache.render('<label for="title">Title</label>' +
         '<input type="text" name="title" value="{{title}}" /><br />' +
-        '<label for="query">Query</label>' +
-        '<input type="text" name="query" value="{{query}}" /><br />' +
+        '<label for="query">Query</label><br />' +
+        '<textarea name="query" class="query">{{query}}</textarea><br />' +
         '<label for="max">Max</label>' +
         '<input type="text" name="max" value="{{max}}" /><br />' +
         '<span class="desc">"all", "host", "service", or any number.</span>',
diff --git a/lib/riemann/dash/views/css.scss b/lib/riemann/dash/views/css.scss
index f48c3d4..d9b4575 100644
--- a/lib/riemann/dash/views/css.scss
+++ b/lib/riemann/dash/views/css.scss
@@ -275,6 +275,11 @@ html,table {
   cursor:pointer;
 }
 
+textarea.query {
+  width: 100%;
+  height: 100px;
+}
+
 .quickfit {
   display: block;
   white-space: nowrap;