diff --git a/share/layout/body.tt b/share/layout/body.tt
index 5f38a313ae..5de496d51f 100644
--- a/share/layout/body.tt
+++ b/share/layout/body.tt
@@ -159,8 +159,8 @@ var mainWrapperInit = function () {
             return true;
         }
         var _href = $(this).attr('href');
-        var backuri = $(this).data('backuri') ? $(this).data('backuri') : '[%-backuri-%]';
-        var _back = 'back=[% backuri | uri %]';
+        var backuri = $(this).data('backuri') ? $(this).data('backuri') : '[%- backuri | uri -%]';
+        var _back = 'back='+backuri;
         if(_href == null || _href.match(/[&\?]back=/)) {
             // ignore 
         } else if(_href.match(/\?/)) {
diff --git a/share/templates/rewrite/rules_list.tt b/share/templates/rewrite/rules_list.tt
index c85271cd86..5f9a44f447 100644
--- a/share/templates/rewrite/rules_list.tt
+++ b/share/templates/rewrite/rules_list.tt
@@ -49,7 +49,7 @@
             <td class="ngcp-actions-column">
             [% UNLESS c.user.read_only -%]
                 <div class="sw_actions pull-right">
-                    <a class="btn btn-small btn-primary" data-backuri="[%-backuritmp=c.req.uri;backuri.query_param_delete('move');backuritmp.query_param_delete('where');backuritmp-%]" href="[% c.uri_for_action('/rewrite/rules_edit',[set_result.id, r.id]) %]">
+                    <a class="btn btn-small btn-primary" data-backuri="[%-backuritmp=c.req.uri;backuritmp.query_param_delete('back');backuritmp.query_param_delete('move');backuritmp.query_param_delete('where');backuritmp-%]" href="[% c.uri_for_action('/rewrite/rules_edit',[set_result.id, r.id]) %]">
                         <i class="icon-edit"></i> [% c.loc('Edit') %]
                     </a>
                     <a data-confirm="Delete" class="btn btn-small btn-secondary" href="[% c.uri_for_action('/rewrite/rules_delete',[set_result.id, r.id]) %]">