diff --git a/share/layout/body.tt b/share/layout/body.tt
index b43f94fa51..5f38a313ae 100644
--- a/share/layout/body.tt
+++ b/share/layout/body.tt
@@ -159,6 +159,7 @@ var mainWrapperInit = function () {
             return true;
         }
         var _href = $(this).attr('href');
+        var backuri = $(this).data('backuri') ? $(this).data('backuri') : '[%-backuri-%]';
         var _back = 'back=[% backuri | uri %]';
         if(_href == null || _href.match(/[&\?]back=/)) {
             // ignore 
diff --git a/share/templates/rewrite/rules_list.tt b/share/templates/rewrite/rules_list.tt
index d3aa15aa18..c85271cd86 100644
--- a/share/templates/rewrite/rules_list.tt
+++ b/share/templates/rewrite/rules_list.tt
@@ -21,7 +21,6 @@
 [% END -%]
 
 <div class="ngcp-separator"></div>
-
 [% MACRO show_rules BLOCK -%]
 <table class="table table-bordered table-striped table-highlight table-hover">
     <thead>
@@ -50,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" 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;backuri.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]) %]">