--- a/roundup/cgi/actions.py	Mon Nov 28 16:09:39 2016 +0100
+++ b/roundup/cgi/actions.py	Fri Dec 09 09:49:25 2016 +0100
@@ -400,11 +400,12 @@
         because the leading '?' is not part of the query string.
 
         Implementation note:
-        But maybe the template should be part of the stored query:
+        We now store the template with the query if the template name is
+        different from 'index'
+        """
         template = self.getFromForm('template')
-        if template:
+        if template and template != 'index':
             return req.indexargs_url('', {'@template' : template})[1:]
-        """
         return req.indexargs_url('', {})[1:]
 
     def getFromForm(self, name):