diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a4e1917..f0bb4849 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## --- [4.0.17] - 2022/TBD
 ### New features
 - Automate forge install process through Crafty server creation for Forge server version 1.16 and greater. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/495))
+- Tooltip for server port on dashboard. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/496))
 ### Bug fixes
 - Fix no port on bedrock server creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/493))
 ### Tweaks
diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 9d91e156..1fac58cf 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -279,22 +279,27 @@
 
                   </td>
                   <td draggable="false" id="server_running_status_{{server['server_data']['server_id']}}">
-                    {% if server['stats']['running'] %}
-                    <span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
-                      data['lang']) }}</span>
-                    {% elif server['stats']['crashed'] %}
-                    <span class="text-danger"><i class="fas fa-exclamation-triangle"></i> {{ translate('dashboard',
-                      'crashed',
-                      data['lang']) }}</span>
-                    {% else %}
-                    <span class="text-warning"><i class="fas fa-ban"></i> {{ translate('dashboard', 'offline',
-                      data['lang']) }}</span>
-                    {% end %}
+                    <span class="port" data-toggle="tooltip" title="{{
+                      server['server_data']['server_port'] }}">
+                      {% if server['stats']['running'] %}
+                      <span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
+                        data['lang']) }}</span>
+                      {% elif server['stats']['crashed'] %}
+                      <span class="text-danger"><i class="fas fa-exclamation-triangle"></i> {{ translate('dashboard',
+                        'crashed',
+                        data['lang']) }}</span>
+                      {% else %}
+                      <span class="text-warning"><i class="fas fa-ban"></i> {{ translate('dashboard', 'offline',
+                        data['lang']) }}</span>
+                      {% end %}
+                      <br />
+                      <br />
                   </td>
                   <span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}"
                     data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
                 </tr>
                 {% end %}
+                </span>
                 {% for server in data['failed_servers'] %}
                 <tr id="{{server['server_id']}}" draggable="false">
                   <td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning"