diff --git a/app/Livewire/Project/Resource/EnvironmentSelect.php b/app/Livewire/Project/Resource/EnvironmentSelect.php
new file mode 100644
index 000000000..efb1b6ca2
--- /dev/null
+++ b/app/Livewire/Project/Resource/EnvironmentSelect.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Livewire\Project\Resource;
+
+use Illuminate\Database\Eloquent\Collection;
+use Livewire\Component;
+
+class EnvironmentSelect extends Component
+{
+    public Collection $environments;
+
+    public string $project_uuid = '';
+
+    public string $selectedEnvironment = '';
+
+    public function mount()
+    {
+        $this->selectedEnvironment = request()->route('environment_name');
+        $this->project_uuid = request()->route('project_uuid');
+    }
+
+    public function updatedSelectedEnvironment($value)
+    {
+        if ($value === 'edit') {
+            return redirect()->route('project.show', [
+                'project_uuid' => $this->project_uuid,
+            ]);
+        } else {
+            return redirect()->route('project.resource.index', [
+                'project_uuid' => $this->project_uuid,
+                'environment_name' => $value,
+            ]);
+        }
+    }
+}
diff --git a/app/Models/Project.php b/app/Models/Project.php
index acc98e341..1cbce6cac 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -112,4 +112,14 @@ class Project extends BaseModel
     {
         return $this->postgresqls()->get()->merge($this->redis()->get())->merge($this->mongodbs()->get())->merge($this->mysqls()->get())->merge($this->mariadbs()->get())->merge($this->keydbs()->get())->merge($this->dragonflies()->get())->merge($this->clickhouses()->get());
     }
+
+    public function default_environment()
+    {
+        $default = $this->environments()->where('name', 'production')->first();
+        if (! $default) {
+            $default = $this->environments()->sortBy('created_at')->first();
+        }
+
+        return $default;
+    }
 }
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index b720885ff..0a5cb26bb 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -13,7 +13,7 @@
         @forelse ($projects as $project)
             <div class="box group" x-data x-on:click="goto('{{ $project->uuid }}')">
                 <a class="flex flex-col justify-center flex-1 mx-6"
-                    href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                    href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $project->default_environment()->name]) }}">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>
diff --git a/resources/views/livewire/project/resource/environment-select.blade.php b/resources/views/livewire/project/resource/environment-select.blade.php
new file mode 100644
index 000000000..cd9219efc
--- /dev/null
+++ b/resources/views/livewire/project/resource/environment-select.blade.php
@@ -0,0 +1,8 @@
+<x-forms.select label="Switch Environment" wire:model.live="selectedEnvironment">
+    <option value="edit">Create/Edit Environments</option>
+    <option disabled>-----</option>
+    @foreach ($environments as $environment)
+        <option value="{{ $environment->name }}">{{ $environment->name }}
+        </option>
+    @endforeach
+</x-forms.select>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 1f9008e25..f623b41b5 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -36,6 +36,7 @@
                                 d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                                 clip-rule="evenodd"></path>
                         </svg>
+
                         <a class="text-xs truncate lg:text-sm"
                             href="{{ route('project.resource.index', ['environment_name' => request()->route('environment_name'), 'project_uuid' => request()->route('project_uuid')]) }}">{{ request()->route('environment_name') }}</a>
                     </div>
@@ -43,8 +44,11 @@
             </ol>
         </nav>
     </div>
+    <div class="pb-4">
+        <livewire:project.resource.environment-select :environments="$project->environments" />
+    </div>
     @if ($environment->isEmpty())
-        <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+        <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} "
             class="items-center justify-center box">+ Add New Resource</a>
     @else
         <div x-data="searchComponent()">