diff --git a/lib/galaxy/webapps/reports/framework/grids.py b/lib/galaxy/webapps/reports/framework/grids.py
index de2ba43ac06..1cd9c69a135 100644
--- a/lib/galaxy/webapps/reports/framework/grids.py
+++ b/lib/galaxy/webapps/reports/framework/grids.py
@@ -23,8 +23,8 @@ class Grid(object):
     title = ""
     model_class = None
     show_item_checkboxes = False
-    template = "webapps/reports/grid_base.mako"
-    async_template = "webapps/reports/grid_base_async.mako"
+    template = "legacy/grid_base.mako"
+    async_template = "legacy/grid_base_async.mako"
     use_async = False
     use_hide_message = True
     global_actions = []
diff --git a/templates/webapps/reports/grid_base.mako b/templates/legacy/grid_base.mako
similarity index 99%
rename from templates/webapps/reports/grid_base.mako
rename to templates/legacy/grid_base.mako
index 82f92321c30..e9b42543d40 100644
--- a/templates/webapps/reports/grid_base.mako
+++ b/templates/legacy/grid_base.mako
@@ -64,7 +64,7 @@
 
     ## load javascript
     <script type="text/javascript">
-        require(['reports/grid/grid-view'], function(GridView) {
+        require(['legacy/grid/grid-view'], function(GridView) {
             $(function() {
                 var gridView = new GridView.default( ${ h.dumps( self.get_grid_config( embedded=embedded, insert=insert ) ) } );
             });
diff --git a/templates/legacy/grid_base_async.mako b/templates/legacy/grid_base_async.mako
new file mode 100644
index 00000000000..a6bedc9b97f
--- /dev/null
+++ b/templates/legacy/grid_base_async.mako
@@ -0,0 +1,4 @@
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
+
+${init()}
+${h.dumps( grid_base.get_grid_config() )}
diff --git a/templates/webapps/reports/grid_base_async.mako b/templates/webapps/reports/grid_base_async.mako
deleted file mode 100644
index 4b5c9288a3a..00000000000
--- a/templates/webapps/reports/grid_base_async.mako
+++ /dev/null
@@ -1,4 +0,0 @@
-<%namespace name="grid_base" file="/webapps/reports/grid_base.mako" import="*" />
-
-${init()}
-${h.dumps( grid_base.get_grid_config() )}
diff --git a/templates/webapps/tool_shed/category/grid.mako b/templates/webapps/tool_shed/category/grid.mako
index 9c2ab498d7c..fbe9675b7e1 100644
--- a/templates/webapps/tool_shed/category/grid.mako
+++ b/templates/webapps/tool_shed/category/grid.mako
@@ -1,5 +1,5 @@
 <%inherit file="/base.mako"/>
-<%namespace name="grid_base" file="/webapps/reports/grid_base.mako" import="*" />
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
 <%namespace name="grid_common" file="../common/grid_common.mako" import="*" />
 
 <%def name="insert()">
diff --git a/templates/webapps/tool_shed/category/valid_grid.mako b/templates/webapps/tool_shed/category/valid_grid.mako
index 962e2018f36..298c8c88a96 100644
--- a/templates/webapps/tool_shed/category/valid_grid.mako
+++ b/templates/webapps/tool_shed/category/valid_grid.mako
@@ -1,5 +1,5 @@
 <%inherit file="/base.mako"/>
-<%namespace name="grid_base" file="/webapps/reports/grid_base.mako" import="*" />
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
 <%namespace name="grid_common" file="../common/grid_common.mako" import="*" />
 
 <%def name="insert()">
diff --git a/templates/webapps/tool_shed/repository_review/grid.mako b/templates/webapps/tool_shed/repository_review/grid.mako
index df3bfd46f5c..2e645fe5a2e 100644
--- a/templates/webapps/tool_shed/repository_review/grid.mako
+++ b/templates/webapps/tool_shed/repository_review/grid.mako
@@ -1 +1 @@
-<%inherit file="/webapps/reports/grid_base.mako"/>
+<%inherit file="/legacy/grid_base.mako"/>