diff --git a/includes/Frontend/Assets.php b/includes/Frontend/Assets.php
index 4ed9ee2..232613d 100644
--- a/includes/Frontend/Assets.php
+++ b/includes/Frontend/Assets.php
@@ -262,7 +262,19 @@ class Assets {
         
         // If disabled, don't load
         if ($mode === 'disabled') {
-            // Still check for shortcodes
+            // Special handling for WooCommerce Shop page (it's an archive, not a regular post)
+            if (function_exists('is_shop') && is_shop()) {
+                $shop_page_id = get_option('woocommerce_shop_page_id');
+                if ($shop_page_id) {
+                    $shop_page = get_post($shop_page_id);
+                    if ($shop_page && has_shortcode($shop_page->post_content, 'woonoow_shop')) {
+                        error_log('[WooNooW Customer] Found woonoow_shop shortcode on Shop page (ID: ' . $shop_page_id . ')');
+                        return true;
+                    }
+                }
+            }
+            
+            // Check for shortcodes on regular pages
             if ($post) {
                 error_log('[WooNooW Customer] Checking post content for shortcodes');
                 error_log('[WooNooW Customer] Post content: ' . substr($post->post_content, 0, 200));