diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index be270cb0d..5a73f1b82 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -254,7 +254,7 @@ h1 .imageLink {
 
     .content-secondary h1 {
         margin: 0;
-        padding: 20px 0 15px 20px;
+        padding: 20px 0 25px 20px;
         color: #fff;
     }
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 13494042a..457a0ce98 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -612,7 +612,10 @@ var Dashboard = {
             headerHtml += '</a>';
 
             if (user.Configuration.IsAdministrator) {
-                headerHtml += '<a class="imageLink btnTools" href="dashboard.html" data-role="button" data-icon="gear" data-inline="true" data-iconpos="notext">Tools</a>';
+
+                var href = window.location.toString().toLowerCase().indexOf('dashboard.html') == -1 ? 'dashboard.html' : '#';
+
+                headerHtml += '<a class="imageLink btnTools" href="' + href + '" data-role="button" data-icon="gear" data-inline="true" data-iconpos="notext">Tools</a>';
             }
 
         }