diff --git a/resources/views/layouts/tabs.blade.php b/resources/views/layouts/tabs.blade.php
index 349e36bb2..23f1cf278 100644
--- a/resources/views/layouts/tabs.blade.php
+++ b/resources/views/layouts/tabs.blade.php
@@ -9,20 +9,24 @@ class="mb-3"
             <ul class="nav nav-pills nav-justified d-inline-flex mx-auto px-3 py-2 nav-scroll-bar gap-2" role="tablist">
                 @foreach($manyForms as $name => $tab)
                     <li class="nav-item" role="presentation">
-                        <a
-                            @class([
-                                'nav-link',
-                                'active' => $activeTab === $name || ($loop->first && is_null($activeTab))
-                            ])
-                            data-action="tabs#setActiveTab"
-                            href="#tab-{{sha1($templateSlug.$name)}}"
-                            data-bs-target="#tab-{{sha1($templateSlug.$name)}}"
-                            id="button-tab-{{sha1($templateSlug.$name)}}"
-                            aria-selected="false"
-                            role="tab"
-                            data-bs-toggle="tab">
-                            {!! $name !!}
-                        </a>
+                        @if(isset($menuItems[$name]))
+                            {!! $tab[0] !!}
+                        @else
+                            <a
+                                @class([
+                                    'nav-link',
+                                    'active' => $activeTab === $name || ($loop->first && is_null($activeTab))
+                                ])
+                                data-action="tabs#setActiveTab"
+                                href="#tab-{{sha1($templateSlug.$name)}}"
+                                data-bs-target="#tab-{{sha1($templateSlug.$name)}}"
+                                id="button-tab-{{sha1($templateSlug.$name)}}"
+                                aria-selected="false"
+                                role="tab"
+                                data-bs-toggle="tab">
+                                {!! $name !!}
+                            </a>
+                        @endif
                     </li>
                 @endforeach
             </ul>
@@ -32,17 +36,19 @@ class="mb-3"
 
     <section class="tab-content">
         @foreach($manyForms as $name => $forms)
-            <div role="tabpanel"
-                 id="tab-{{sha1($templateSlug.$name)}}"
-                 @class([
-                    'tab-pane',
-                    'active' => $activeTab === $name || ($loop->first && is_null($activeTab))
-                 ])
-            >
-                @foreach($forms as $form)
-                    {!! $form !!}
-                @endforeach
-            </div>
+            @if(!isset($menuItems[$name]))
+                <div role="tabpanel"
+                     id="tab-{{sha1($templateSlug.$name)}}"
+                     @class([
+                        'tab-pane',
+                        'active' => $activeTab === $name || ($loop->first && is_null($activeTab))
+                     ])
+                >
+                    @foreach($forms as $form)
+                        {!! $form !!}
+                    @endforeach
+                </div>
+            @endif
         @endforeach
     </section>
 </div>
diff --git a/src/Screen/Layouts/Tabs.php b/src/Screen/Layouts/Tabs.php
index af452bf68..d5755691c 100644
--- a/src/Screen/Layouts/Tabs.php
+++ b/src/Screen/Layouts/Tabs.php
@@ -4,6 +4,9 @@
 
 namespace Orchid\Screen\Layouts;
 
+use Illuminate\Support\Arr;
+use Orchid\Screen\Actions\Link;
+use Orchid\Screen\Actions\Menu;
 use Orchid\Screen\Layout;
 use Orchid\Screen\Repository;
 
@@ -27,7 +30,7 @@ abstract class Tabs extends Layout
     /**
      * Layout constructor.
      *
-     * @param Layout[] $layouts
+     * @param Layout[]|Link[]|Menu[] $layouts
      */
     public function __construct(array $layouts = [])
     {
@@ -39,7 +42,44 @@ public function __construct(array $layouts = [])
      */
     public function build(Repository $repository)
     {
-        return $this->buildAsDeep($repository);
+        $this->query = $repository;
+
+        if (! $this->isSee()) {
+            return;
+        }
+
+        $layouts = collect($this->layouts);
+        $build = [];
+        $linkItems = [];
+
+        foreach ($layouts as $key => $layout) {
+            if ($layout instanceof Link) {
+                $linkItems[$key] = true;
+                $build[$key][] = $layout->build($repository);
+            } else {
+                $wrappedLayouts = Arr::wrap($layout);
+                $childLayouts = collect($wrappedLayouts)
+                    ->flatten()
+                    ->map(fn ($item) => is_object($item) ? $item : resolve($item))
+                    ->filter(fn () => $this->isSee())
+                    ->reduce(function ($carry, $item) use ($key, $repository) {
+                        $carry[$key][] = $item->build($repository);
+                        return $carry;
+                    }, []);
+
+                if (!empty($childLayouts)) {
+                    $build = array_merge_recursive($build, $childLayouts);
+                }
+            }
+        }
+
+        $variables = array_merge($this->variables, [
+            'templateSlug' => $this->getSlug(),
+            'manyForms'    => $build,
+            'menuItems'    => $linkItems,
+        ]);
+
+        return view($this->template, $variables);
     }
 
     /**