diff --git a/userfiles/modules/admin/modules/sidebar_live_edit.php b/userfiles/modules/admin/modules/sidebar_live_edit.php
index 30e2eebeff7..e65d0158a6c 100644
--- a/userfiles/modules/admin/modules/sidebar_live_edit.php
+++ b/userfiles/modules/admin/modules/sidebar_live_edit.php
@@ -114,10 +114,9 @@ class="mw-sidebar-search-clear-x-btn mw-icon-close"
             //mw.require('libs/html2canvas/html2canvas.min.js');
 
             function mwSidebarSearchClear(what) {
-                mw.element('#mw-sidebar-search-input-for-modules-and-layouts').val('');
-                mw.element('#mw-sidebar-search-input-for-modules').val('');
-                return mwSidebarSearchItems('', what);
+                mw.element('#mw-sidebar-search-input-for-modules-and-layouts,#mw-sidebar-search-input-for-modules').val('');
 
+                return mwSidebarSearchItems('', what);
             }
 
             function mwSidebarSearchItems(value, what) {
@@ -139,6 +138,7 @@ function mwSidebarSearchItems(value, what) {
                     $('.mw-search-no-results' ).hide();
                      $('.mw-ui-box-header-2,.module-item-module').show();
                     $('#modules-and-layouts-sidebar .module-item-module[data-is-hidden]').hide();
+                    mw.element('#mw-sidebar-modules-and-layouts-holder,#mw-sidebar-modules-and-layouts-holder').scrollTop(0);
 
                     return;
                 } else {
@@ -198,6 +198,7 @@ function mwSidebarSearchItems(value, what) {
                 }
 
                 $('#modules-and-layouts-sidebar .module-item-module[data-is-hidden]').hide();
+                mw.element('#mw-sidebar-modules-and-layouts-holder,#mw-sidebar-modules-and-layouts-holder').scrollTop(0);
 
             }
 
diff --git a/userfiles/modules/microweber/api/tools/element.js b/userfiles/modules/microweber/api/tools/element.js
index cd607b4b678..9b3cf7c9318 100644
--- a/userfiles/modules/microweber/api/tools/element.js
+++ b/userfiles/modules/microweber/api/tools/element.js
@@ -27,6 +27,15 @@
             return this;
         };
 
+        this.scrollTop = function (val) {
+            if(typeof val === 'undefined') {
+                return this._active().scrollTop;
+            }
+            return this.each(function(){
+                this.scrollTop = val;
+            });
+        };
+
         this.encapsulate = function () {
 
         };