diff --git a/app/View/Page/Layout.php b/app/View/Page/Layout.php
index 8619ee34..cda28627 100644
--- a/app/View/Page/Layout.php
+++ b/app/View/Page/Layout.php
@@ -7,9 +7,10 @@ use Illuminate\View\Component;
 class Layout extends Component
 {
 
-    public function __construct(public string $pageClass = '', public string $title = '')
+    public function __construct(public string $pageClass = '', public string $title = '', public string $menu = '')
     {
         session()->put('title', $title);
+        session()->put('menu', $menu);
     }
 
     public function userName(): string
diff --git a/app/View/Page/SettingLayout.php b/app/View/Page/SettingLayout.php
index 766592dd..442b6e13 100644
--- a/app/View/Page/SettingLayout.php
+++ b/app/View/Page/SettingLayout.php
@@ -18,13 +18,12 @@ class SettingLayout extends Component
                 'is_active' => get_class($setting) === $active,
                 'title' => $setting->title(),
             ])->toArray();
-        session()->put('menu', 'setting');
     }
 
     public function render()
     {
         return <<<'HTML'
-            <x-page::layout :title="$active::title()">
+            <x-page::layout :title="$active::title()" menu="setting">
                 <x-slot:right>
                     {{ $right ?? '' }}
                 </x-slot:right>
diff --git a/modules/Dashboard/Components/DashboardComponent.php b/modules/Dashboard/Components/DashboardComponent.php
index a57f8504..16d1c2fe 100644
--- a/modules/Dashboard/Components/DashboardComponent.php
+++ b/modules/Dashboard/Components/DashboardComponent.php
@@ -12,16 +12,13 @@ class DashboardComponent extends Component
 
     public function mount(DashboardFactory $factory): void
     {
-        session()->put('menu', 'dashboard');
-        session()->put('title', 'Dashboard');
-
         $this->blocks = $factory->load();
     }
 
     public function render(): string
     {
         return <<<'HTML'
-            <x-page::layout>
+            <x-page::layout title="Dashboard" menu="dashboard">
                 <div class="gap-6 md:grid-cols-2 xl:grid-cols-4 grid p-6">
                     @foreach($this->blocks as $block)
                         <x-ui::box title="{{$block->title()}}" :second="true">