diff --git a/static/js/list.js b/static/js/list.js
index ebfe9ae..9af026d 100644
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -144,7 +144,8 @@ oml.ui.list = function() {
                     oml.UI.set({listSelection: data.ids});
                 },
                 oml_find: function() {
-                    that.reloadList();
+                    // list gets recreated in listPanel to avoid double reload if list and listSort changes
+                    // that.reloadList();
                 },
                 oml_item: function() {
                     if (!ui.item) {
diff --git a/static/js/listPanel.js b/static/js/listPanel.js
index 127b42d..e865ad5 100644
--- a/static/js/listPanel.js
+++ b/static/js/listPanel.js
@@ -27,6 +27,9 @@ oml.ui.listPanel = function() {
             orientation: 'vertical'
         })
         .bindEvent({
+            oml_find: function() {
+                that.replaceElement(1, oml.$ui.list = oml.ui.list());
+            },
             oml_listview: function() {
                 that.replaceElement(1, oml.$ui.list = oml.ui.list());
             },