diff --git a/app/Livewire/Project/Shared/ExecuteContainerCommand.php b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
index 90419caed..574dfa969 100644
--- a/app/Livewire/Project/Shared/ExecuteContainerCommand.php
+++ b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
@@ -52,6 +52,7 @@ class ExecuteContainerCommand extends Component
                     $this->servers = $this->servers->push($server);
                 }
             }
+            $this->loadContainers();
         } elseif (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
             $resource = getResourceByUuid($this->parameters['database_uuid'], data_get(auth()->user()->currentTeam(), 'id'));
@@ -62,12 +63,18 @@ class ExecuteContainerCommand extends Component
             if ($this->resource->destination->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->destination->server);
             }
+            $this->loadContainers();
         } elseif (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             if ($this->resource->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->server);
             }
+            $this->loadContainers();
+        } elseif (data_get($this->parameters, 'server_uuid')) {
+            $this->type = 'server';
+            $this->resource = Server::where('uuid', $this->parameters['server_uuid'])->firstOrFail();
+            $this->server = $this->resource;
         }
     }
 
@@ -130,6 +137,28 @@ class ExecuteContainerCommand extends Component
         if ($this->containers->count() > 0) {
             $this->container = $this->containers->first();
         }
+        if ($this->containers->count() === 1) {
+            $this->selected_container = data_get($this->containers->first(), 'container.Names');
+        }
+    }
+
+    #[On('connectToServer')]
+    public function connectToServer()
+    {
+        try {
+            if ($this->server->isForceDisabled()) {
+                throw new \RuntimeException('Server is disabled.');
+            }
+            $this->dispatch(
+                'send-terminal-command',
+                false,
+                data_get($this->server, 'name'),
+                data_get($this->server, 'uuid')
+            );
+
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     #[On('connectToContainer')]
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 64c495fec..4ad034d7e 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -131,6 +131,11 @@ class Server extends BaseModel
 
     protected $guarded = [];
 
+
+    public function type()
+    {
+        return 'server';
+    }
     public static function isReachable()
     {
         return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true);
diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index a7033775a..ff28cdbdf 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -39,6 +39,12 @@
                 ]) }}">
                 <button>Resources</button>
             </a>
+            <a class="{{ request()->routeIs('server.command') ? 'dark:text-white' : '' }}"
+                href="{{ route('server.command', [
+                    'server_uuid' => data_get($parameters, 'server_uuid'),
+                ]) }}">
+                <button>Terminal</button>
+            </a>
         </nav>
         <div class="order-first sm:order-last">
             <livewire:server.proxy.deploy :server="$server" />
diff --git a/resources/views/livewire/project/shared/execute-container-command.blade.php b/resources/views/livewire/project/shared/execute-container-command.blade.php
index 927e795ec..cb39e0855 100644
--- a/resources/views/livewire/project/shared/execute-container-command.blade.php
+++ b/resources/views/livewire/project/shared/execute-container-command.blade.php
@@ -2,24 +2,36 @@
     <x-slot:title>
         {{ data_get_str($resource, 'name')->limit(10) }} > Commands | Coolify
     </x-slot>
-    <livewire:project.shared.configuration-checker :resource="$resource" />
     @if ($type === 'application')
+        <livewire:project.shared.configuration-checker :resource="$resource" />
         <h1>Terminal</h1>
         <livewire:project.application.heading :application="$resource" />
     @elseif ($type === 'database')
+        <livewire:project.shared.configuration-checker :resource="$resource" />
         <h1>Terminal</h1>
         <livewire:project.database.heading :database="$resource" />
     @elseif ($type === 'service')
+        <livewire:project.shared.configuration-checker :resource="$resource" />
         <livewire:project.service.navbar :service="$resource" :parameters="$parameters" title="Terminal" />
+    @elseif ($type === 'server')
+        <x-server.navbar :server="$server" :parameters="$parameters" />
     @endif
-    <div x-init="$wire.loadContainers">
-        <div class="pt-4" wire:loading wire:target='loadContainers'>
-            Loading resources...
+    @if ($type === 'server')
+        <form class="w-full" wire:submit="$dispatchSelf('connectToServer')" wire:init="$dispatchSelf('connectToServer')">
+            <x-forms.button class="w-full" type="submit">Reconnect</x-forms.button>
+        </form>
+        <div class="mx-auto w-full">
+            <livewire:project.shared.terminal />
         </div>
-        <div wire:loading.remove wire:target='loadContainers'>
-            @if (count($containers) > 0)
-                <form class="flex flex-col gap-2 justify-center pt-4 xl:items-end xl:flex-row"
-                    wire:submit="$dispatchSelf('connectToContainer')">
+    @else
+        @if (count($containers) > 0)
+            @if (count($containers) === 1)
+                <form class="w-full pt-4"
+                    wire:submit="$dispatchSelf('connectToContainer')" wire:init="$dispatchSelf('connectToContainer')">
+                    <x-forms.button class="w-full" type="submit">Reconnect</x-forms.button>
+                </form>
+            @else
+                <form class="w-full pt-4 flex gap-2 flex-col" wire:submit="$dispatchSelf('connectToContainer')">
                     <x-forms.select label="Container" id="container" required wire:model="selected_container">
                         @foreach ($containers as $container)
                             @if ($loop->first)
@@ -31,14 +43,16 @@
                             </option>
                         @endforeach
                     </x-forms.select>
-                    <x-forms.button type="submit">Connect</x-forms.button>
+                    <x-forms.button class="w-full" type="submit">
+                        Connect
+                    </x-forms.button>
                 </form>
-            @else
-                <div class="pt-4">No containers are running.</div>
             @endif
-        </div>
-    </div>
-    <div class="mx-auto w-full">
-        <livewire:project.shared.terminal />
-    </div>
+            <div class="mx-auto w-full">
+                <livewire:project.shared.terminal />
+            </div>
+        @else
+            <div class="pt-4">No containers are running.</div>
+        @endif
+    @endif
 </div>
diff --git a/routes/web.php b/routes/web.php
index 339987bc9..eb1480b9f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -212,6 +212,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/private-key', PrivateKeyShow::class)->name('server.private-key');
         Route::get('/destinations', DestinationShow::class)->name('server.destinations');
         Route::get('/log-drains', LogDrains::class)->name('server.log-drains');
+        Route::get('/terminal', ExecuteContainerCommand::class)->name('server.command');
     });
 
     // Route::get('/security', fn () => view('security.index'))->name('security.index');