diff --git a/tailbone/templates/master/index.mako b/tailbone/templates/master/index.mako
index eccb7bac..5376c37b 100644
--- a/tailbone/templates/master/index.mako
+++ b/tailbone/templates/master/index.mako
@@ -17,6 +17,13 @@
         $('.newgrid-wrapper').gridwrapper();
     });
   </script>
+  <style type="text/css">
+    .grid-tools {
+        float: right;
+        position: relative;
+        top: -36px;
+    }
+  </style>
 </%def>
 
 <%def name="context_menu_items()">
@@ -25,8 +32,10 @@
   % endif
 </%def>
 
+<%def name="grid_tools()"></%def>
+
 <ul id="context-menu">
   ${self.context_menu_items()}
 </ul>
 
-${grid.render_complete()|n}
+${grid.render_complete(tools=capture(self.grid_tools))|n}
diff --git a/tailbone/templates/newgrids/complete.mako b/tailbone/templates/newgrids/complete.mako
index 0636f644..4f6d89aa 100644
--- a/tailbone/templates/newgrids/complete.mako
+++ b/tailbone/templates/newgrids/complete.mako
@@ -3,5 +3,10 @@
   % if grid.filterable:
       ${grid.render_filters()|n}
   % endif
+  % if tools:
+      <div class="grid-tools">
+        ${tools|n}
+      </div>
+  % endif
   ${grid.render_grid()|n}
 </div><!-- newgrid-wrapper -->