diff --git a/src/pat/controlpanels/registry--implementation.js b/src/pat/controlpanels/registry--implementation.js
index bede729dd..47d0da325 100644
--- a/src/pat/controlpanels/registry--implementation.js
+++ b/src/pat/controlpanels/registry--implementation.js
@@ -1,8 +1,6 @@
 import $ from "jquery";
-import registry from "@patternslib/patternslib/src/core/registry";
 import utils from "../../core/utils";
 import Modal from "../modal/modal";
-import Base from "@patternslib/patternslib/src/core/base";
 
 export default class ConfigRegistry {
     constructor(el) {
@@ -13,8 +11,9 @@ export default class ConfigRegistry {
             var $el = $(this);
             var options = {
                 actionOptions: {
+                    displayInModal: false,
+                    reloadWindowOnClose: false,
                     onSuccess: function (modal) {
-                        modal.hide();
                         $("#searchrow form#registry-filter").trigger("submit");
                     },
                 },
@@ -36,50 +35,39 @@ export default class ConfigRegistry {
         /* ajax retrieval of paging */
         $("#recordsContainer").on(
             "click",
-            "nav.pagination a, div.listingBar a",
-            function () {
+            ".pagination a, .listingBar a",
+            function (e) {
+                e.preventDefault();
                 var $el = $(this);
                 utils.loading.show();
-                $("#recordsContainer").load(
-                    $el.attr("href") + " #recordsTable",
+                $("#recordsTable").load(
+                    $el.attr("href") + " #recordsTable > *",
                     function () {
-                        /* scan registry */
-                        registry.scan($("#recordsTable"));
                         self.loadModals();
                         utils.loading.hide();
                     }
                 );
-                return false;
             }
         );
 
         /* ajax form submission */
         $("#recordsContainer").on("submit", "#searchrow form", function (e) {
+            e.preventDefault();
             var $el = $(this);
             utils.loading.show();
-            $("#recordsContainer").load(
-                $("body").attr("data-base-url") +
-                    "?" +
-                    $el.serialize() +
-                    " #recordsTable",
+            $("#recordsTable").load(
+                $("body").attr("data-base-url")
+                + "?" + $el.serialize() + " #recordsTable > *",
                 function () {
-                    $("#spinner").hide();
-                    $('#searchrow input[name="q"]').trigger("keypress");
-                    registry.scan($("#recordsTable"));
                     self.loadModals();
                     utils.loading.hide();
                 }
             );
-            e.preventDefault();
-            return false;
         });
 
         /* force submit on select change */
         $("#recordsContainer").on("change", "#searchrow select", function () {
             $("#searchrow form#registry-filter").trigger("submit");
         });
-
-        /* some init */
-        $('#searchrow input[name="q"]').trigger("keypress");
     }
 }