diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php
index de2223d6a..b99121a40 100644
--- a/app/Http/Livewire/Server/New/ByIp.php
+++ b/app/Http/Livewire/Server/New/ByIp.php
@@ -29,6 +29,9 @@ class ByIp extends Component
     public function mount()
     {
         $this->name = generateRandomName();
+        if ($this->private_keys->count() > 0) {
+            $this->private_key_id = $this->private_keys->first()->id;
+        }
     }
     public function setPrivateKey(string $private_key_id)
     {
diff --git a/database/migrations/2023_03_24_140712_create_server_settings_table.php b/database/migrations/2023_03_24_140712_create_server_settings_table.php
index 4d16ef64d..ed2e6d122 100644
--- a/database/migrations/2023_03_24_140712_create_server_settings_table.php
+++ b/database/migrations/2023_03_24_140712_create_server_settings_table.php
@@ -14,6 +14,7 @@ return new class extends Migration
         Schema::create('server_settings', function (Blueprint $table) {
             $table->id();
             $table->string('uuid')->unique();
+            $table->boolean('is_jump_server')->default(false);
             $table->boolean('is_build_server')->default(false);
             $table->boolean('is_validated')->default(false);
 
diff --git a/resources/views/components/magic-bar.blade.php b/resources/views/components/magic-bar.blade.php
index 12fa02648..e1fac8f3b 100644
--- a/resources/views/components/magic-bar.blade.php
+++ b/resources/views/components/magic-bar.blade.php
@@ -166,6 +166,30 @@
             </div>
         </div>
     </template>
+    {{-- Private Keys --}}
+    <template x-cloak x-if="privateKeysMenu">
+        <div x-on:click.outside="closeMenus">
+            <input x-ref="search" x-model="search" class="magic-input" placeholder="Select a private key..."
+                x-on:keyup.escape="closeMenus" x-on:keydown.down="focusNext(privateKeys.length)"
+                x-on:keydown.up="focusPrev(privateKeys.length)"
+                x-on:keyup.enter="focusedIndex !== '' && await set('jumpToPrivateKey',filteredPrivateKeys()[focusedIndex].uuid)" />
+            <div class="magic-items">
+                <template x-if="privateKeys.length === 0">
+                    <div class="magic-item" x-on:click="set('newPrivateKey')">
+                        <span>No private key found. Click here to add a new one!</span>
+                    </div>
+                </template>
+                <template x-for="(privateKey,index) in filteredPrivateKeys" :key="privateKey.name ?? privateKey">
+                    <div x-on:click="await set('jumpToPrivateKey',privateKey.uuid)"
+                        :class="focusedIndex === index && 'magic-item-focused'"
+                        class="py-2 pl-4 cursor-pointer hover:bg-neutral-700">
+                        <span class="px-2 mr-1 text-xs bg-purple-700 rounded">Jump</span>
+                        <span x-text="privateKey.name"></span>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </template>
 </div>
 
 <script>
@@ -177,7 +201,8 @@
                     !this.projectMenu &&
                     !this.environmentMenu &&
                     !this.projectsMenu &&
-                    !this.destinationsMenu
+                    !this.destinationsMenu &&
+                    !this.privateKeysMenu
             },
             focus() {
                 if (this.$refs.search) this.$refs.search.focus()
@@ -201,6 +226,9 @@
                 this.$watch('environmentMenu', () => {
                     this.focus()
                 })
+                this.$watch('privateKeysMenu', () => {
+                    this.focus()
+                })
             },
             mainMenu: false,
             serverMenu: false,
@@ -209,6 +237,7 @@
             projectMenu: false,
             projectsMenu: false,
             environmentMenu: false,
+            privateKeysMenu: false,
             search: '',
 
             selectedAction: '',
@@ -221,6 +250,7 @@
             destinations: ['Loading...'],
             projects: ['Loading...'],
             environments: ['Loading...'],
+            privateKeys: ['Loading...'],
 
             focusedIndex: "",
             items: [{
@@ -286,6 +316,12 @@
                     type: 'Jump',
                     tags: 'destinations',
                     next: 'destinations'
+                },
+                {
+                    name: 'Private Keys',
+                    type: 'Jump',
+                    tags: 'private keys,ssh, keys, key',
+                    next: 'privateKeys'
                 }
             ],
             focusPrev(maxLength) {
@@ -367,6 +403,13 @@
                         .toLowerCase())
                 })
             },
+            filteredPrivateKeys() {
+                if (this.search === '') return this.privateKeys
+                return this.privateKeys.filter(privateKey => {
+                    return privateKey.name.toLowerCase().includes(this.search
+                        .toLowerCase())
+                })
+            },
             async newProject() {
                 const response = await fetch('/magic?server=' + this.selectedServer +
                     '&destination=' + this.selectedDestination +
@@ -465,6 +508,17 @@
                         this.closeMenus()
                         this.destinationsMenu = true
                         break
+                    case 'privateKeys':
+                        response = await fetch('/magic?privateKeys=true');
+                        if (response.ok) {
+                            const {
+                                privateKeys
+                            } = await response.json();
+                            this.privateKeys = privateKeys;
+                        }
+                        this.closeMenus()
+                        this.privateKeysMenu = true
+                        break
                     case 'environment':
                         if (this.focusedIndex === 0) {
                             this.focusedIndex = ''
@@ -472,7 +526,6 @@
                         }
 
                         this.selectedProject = id
-
                         response = await fetch('/magic?server=' + this
                             .selectedServer +
                             '&destination=' + this.selectedDestination +
@@ -494,7 +547,6 @@
                             return await this.newEnvironment()
                         }
                         this.selectedEnvironment = id
-                        console.log(this.selectedAction)
                         if (this.selectedAction === 0) {
                             window.location =
                                 `/project/${this.selectedProject}/${this.selectedEnvironment}/new?type=public&destination=${this.selectedDestination}`
@@ -517,6 +569,10 @@
                         window.location = `/destination/${id}`
                         this.closeMenus()
                         break
+                    case 'jumpToPrivateKey':
+                        window.location = `/private-key/${id}`
+                        this.closeMenus()
+                        break
                     case 'newServer':
                         window.location = `/server/new`
                         this.closeMenus()
diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php
index c3f2ddf33..feb27ab27 100644
--- a/resources/views/livewire/server/new/by-ip.blade.php
+++ b/resources/views/livewire/server/new/by-ip.blade.php
@@ -1,26 +1,24 @@
 <div>
     <form class="flex flex-col gap-1" wire:submit.prevent='submit'>
-        <div class="flex items-center gap-2">
-            <h1>New Server</h1>
-            <x-inputs.button type="submit">
-                Save
-            </x-inputs.button>
-        </div>
+        <h1>New Server</h1>
         <x-inputs.input id="name" label="Name" required />
         <x-inputs.input id="description" label="Description" />
         <x-inputs.input id="ip" label="IP Address" required />
         <x-inputs.input id="user" label="User" />
         <x-inputs.input type="number" id="port" label="Port" />
-        <x-inputs.input id="private_key_id" label="Private Key Id" readonly hidden />
-
-        <h1>Select a private key</h1>
-        <div class="flex">
+        <label>Private Key</label>
+        <select wire:model.defer="private_key_id">
+            <option disabled>Select a private key</option>
             @foreach ($private_keys as $key)
-                <div class="w-32 box" wire:click.defer.prevent="setPrivateKey('{{ $key->id }}')">
-                    {{ $key->name }}
-                </div>
+                @if ($loop->first)
+                    <option selected value="{{ $key->id }}">{{ $key->name }}</option>
+                @else
+                    <option value="{{ $key->id }}">{{ $key->name }}</option>
+                @endif
             @endforeach
-        </div>
+        </select>
+        <x-inputs.button isBold type="submit">
+            Save
+        </x-inputs.button>
     </form>
-
 </div>
diff --git a/routes/web.php b/routes/web.php
index 29ff6896d..a39d0812b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -47,6 +47,13 @@ Route::middleware(['auth'])->group(function () {
                     'destinations' => $destinations->toArray(),
                 ]);
             }
+            // Get private Keys
+            if (request()->query('privateKeys') === 'true') {
+                $privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get();
+                return response()->json([
+                    'privateKeys' => $privateKeys->toArray(),
+                ]);
+            }
             // Get projects
             if ((request()->query('server') && request()->query('destination') && request()->query('projects') === 'true') || request()->query('projects') === 'true') {
                 $projects = Project::where('team_id', session('currentTeam')->id)->get();