diff --git a/CHANGELOG.md b/CHANGELOG.md
index 951ee92bf..434fe552e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 
 ### Fixed
 * Wrong error highlighting of overallocate fields on Node creation ([#90](https://github.com/Pterodactyl/Panel/issues/90), thanks [@schrej](https://github.com/schrej))
+* Server link in navbar directed to 404 link (PR by [@Randomfish132](https://github.com/Randomfish132))
 
 ## v0.4.0
 
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 6cfcfd521..3bba1c06e 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -173,7 +173,7 @@
                 @section('server-name')
                     @if (isset($server->name) && isset($node->name))
                         <ul class="nav navbar-nav">
-                            <li class="active" id="{{ $server->name }}"><a href="/server/{{ $server->uuidShort }}/index"><i id="applyUpdate" class="fa fa-circle-o-notch fa-spinner fa-spin spin-light"></i> {{ $server->name }}</a></li>
+                            <li class="active" id="{{ $server->name }}"><a href="/server/{{ $server->uuidShort }}"><i id="applyUpdate" class="fa fa-circle-o-notch fa-spinner fa-spin spin-light"></i> {{ $server->name }}</a></li>
                         </ul>
                     @endif
                 @show
@@ -230,7 +230,6 @@
                 @show
             </div>
         </div>
-        <!-- Add Back Mobile Support -->
         <div class="row">
             <div class="col-md-3 hidden-xs hidden-sm" id="sidebar_links">
                 @section('sidebar')