diff --git a/includes/Base/Renderer/CategoryTabsProductsRenderer.php b/includes/Base/Renderer/CategoryTabsProductsRenderer.php
index a76cb49..16f543e 100644
--- a/includes/Base/Renderer/CategoryTabsProductsRenderer.php
+++ b/includes/Base/Renderer/CategoryTabsProductsRenderer.php
@@ -155,18 +155,33 @@ public function render()
 
         $tabs = $this->generateTabs();
         $layout = array_get($this->options, 'sub_layout', Card::LAYOUT_NAME);
+        /**
+         * @var \Jankx\PostLayout\PostLayoutManager
+         */
         $postLayoutManager = PostLayoutManager::getInstance(
             TemplateAndLayout::getTemplateEngine()
                 ->getId()
         );
 
+        if (is_null($postLayoutManager)) {
+            return;
+        }
+
         do_action("jankx/ecommerce/loop/before", $this->options);
 
+        /**
+         * @var \Jankx\PostLayout\Layout\Tabs
+         */
         $productLayout = $postLayoutManager->createLayout(
             Tabs::LAYOUT_NAME,
             $this->buildFirstTabQuery()
         );
-        $productLayout->setOptions($this->layoutOptions);
+        $productLayout->setOptions(array_merge(
+            [
+                'wrap_tag_name' => 'ul',
+            ],
+            $this->layoutOptions
+        ));
 
         $productLayout->setTabs($this->transformDataTabs2PostLayoutTabs($tabs));
         $productLayout->addChildLayout($layout);
diff --git a/includes/Integration/Elementor/Widgets/Products.php b/includes/Integration/Elementor/Widgets/Products.php
index 750193d..26c849d 100644
--- a/includes/Integration/Elementor/Widgets/Products.php
+++ b/includes/Integration/Elementor/Widgets/Products.php
@@ -161,6 +161,7 @@ protected function render()
             'columns' => $this->get_responsive_setting('columns', 4),
             'rows' => $this->get_responsive_setting('rows', 1),
             'thumbnail_size'  => array_get($settings, 'thumbnail_size', 'medium'),
+            'wrap_tag_name' => 'ul',
         ));
 
         // Set Woocommerce loop columns