diff --git a/library/ZendAfi/Controller/Plugin/Manager/Manager.php b/library/ZendAfi/Controller/Plugin/Manager/Manager.php
index 47c2100b794ce30a8e1c1c81763617180b8c8f76..0dc6c8028711afc34d2ceff1f2126a71aa69f012 100644
--- a/library/ZendAfi/Controller/Plugin/Manager/Manager.php
+++ b/library/ZendAfi/Controller/Plugin/Manager/Manager.php
@@ -165,13 +165,14 @@ class ZendAfi_Controller_Plugin_Manager_Manager extends ZendAfi_Controller_Plugi
 
 
   protected function _getEditUrl($model) {
-    return ['action' => 'edit',
+    return ['module' => 'admin',
+            'action' => 'edit',
             'id' => $model->getId()];
   }
 
 
   protected function _redirectToEdit($model) {
-    $url = $this->_view->url($this->_getEditUrl($model));
+    $url = $this->_view->absoluteUrl($this->_getEditUrl($model));
     return ('1' === $this->_getParam('styles_reload'))
       ? $this->_redirect($url)
       : $this->_redirectClose($url);
diff --git a/public/opac/js/subModal.js b/public/opac/js/subModal.js
index 22aa192e091698444b531868195f33fdec1d0fd0..b595bcf2f79569adaa0dc85c26b37e165e827a78 100644
--- a/public/opac/js/subModal.js
+++ b/public/opac/js/subModal.js
@@ -193,7 +193,7 @@
       var action = dialog_form[0].getAttribute('action');
       $('body').find('a[class*="edit_"], .configuration_module a').each(function() {
 	var href = $(this)[0].getAttribute('href');
-	if(action.indexOf(href) > -1) {
+	if(action.indexOf(href) > -1 || href.indexOf(action) > -1) {
 	  return current_anchor = $(this);
 	}
       });