diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2842620a..06c7846d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -884,7 +884,7 @@
         <div class="flex w-full">
           <div class="hidden xl:block xl:w-1/6">
             <aside
-              class="fixed overflow-y-scroll scroller overflow-hidden inset-y-0 left-0 z-50 xl:flex w-64 flex-col xl:border-r xl:border-gray-800 bg-[#141417]"
+              class="fixed overflow-y-auto scroller overflow-hidden inset-y-0 left-0 z-50 xl:flex w-64 flex-col xl:border-r xl:border-gray-800 bg-[#141417]"
             >
               <nav
                 class="flex flex-col items-center mr-auto gap-y-4 xl:py-5 w-full"
diff --git a/src/routes/stock-screener/+page.svelte b/src/routes/stock-screener/+page.svelte
index 7b045c95..5495677e 100644
--- a/src/routes/stock-screener/+page.svelte
+++ b/src/routes/stock-screener/+page.svelte
@@ -1380,7 +1380,7 @@
   });
 
   // Update ruleCondition and valueMappings based on existing rules
-  ruleOfList.forEach((rule) => {
+  ruleOfList?.forEach((rule) => {
     ruleCondition[rule.name] =
       rule.condition || allRules[rule.name].defaultCondition;
     valueMappings[rule.name] = rule.value || allRules[rule.name].defaultValue;
diff --git a/src/routes/stock-screener/workers/filterWorker.ts b/src/routes/stock-screener/workers/filterWorker.ts
index 249ea8a4..2f532506 100644
--- a/src/routes/stock-screener/workers/filterWorker.ts
+++ b/src/routes/stock-screener/workers/filterWorker.ts
@@ -214,11 +214,13 @@ onmessage = async (event: MessageEvent) => {
   const { stockScreenerData, ruleOfList } = event.data || {};
 
   try {
-    const filteredData = await filterStockScreenerData(
+    let filteredData = await filterStockScreenerData(
       stockScreenerData,
       ruleOfList
     );
 
+    filteredData = filteredData?.sort((a,b) => b?.marketCap - a?.marketCap);
+
     postMessage({ 
       message: "success", 
       filteredData,