diff --git a/app/templates/config-host-edit.php b/app/templates/config-host-edit.php
index c1fccbc..cec31f4 100644
--- a/app/templates/config-host-edit.php
+++ b/app/templates/config-host-edit.php
@@ -43,7 +43,7 @@
                             <input type="hidden" name="host" value="<?= htmlspecialchars($hostDetails[0]['id']) ?>" />
 
                             <br />
-                            <a class="btn btn-outline-secondary btn-sm" href="<?= htmlspecialchars($app_root) ?>?page=config&item=host#platform<?= htmlspecialchars($platform_id) ?>host<?= htmlspecialchars($hostDetails[0]['id']) ?>" />Cancel</a>
+                            <a class="btn btn-outline-secondary btn-sm" href="<?= htmlspecialchars($app_root) ?>?page=config&item=host&platform=<?= htmlspecialchars($platform_id) ?>&host=<?= htmlspecialchars($hostDetails[0]['id']) ?>#platform<?= htmlspecialchars($platform_id) ?>host<?= htmlspecialchars($hostDetails[0]['id']) ?>" />Cancel</a>
                             &nbsp;&nbsp;
                             <input type="submit" class="btn btn-primary btn-sm" value="Save" />
                         </form>
diff --git a/app/templates/config-host.php b/app/templates/config-host.php
index c046ad1..f737faa 100644
--- a/app/templates/config-host.php
+++ b/app/templates/config-host.php
@@ -17,7 +17,7 @@
 <?php foreach ($hosts as $host_array) { ?>
                                 <li style="padding-bottom: 10px;">
                                     <a name="platform<?= htmlspecialchars($platform_array['id']) ?>host<?= htmlspecialchars($host_array['id']) ?>"></a>
-                                    <span>
+                                    <span class="<?= isset($_REQUEST['platform']) && (int)$platform_array['id'] === (int)$_REQUEST['platform'] && isset($_REQUEST['host']) && (int)$host_array['id'] === (int)$_REQUEST['host'] ? 'border rounded bg-light' : '' ?>" style="padding: 12px;">
                                         <?= htmlspecialchars($host_array['address']) ?>:<?= htmlspecialchars($host_array['port']) ?>
                                         &nbsp;
                                         <a class="btn btn-outline-secondary btn-sm" href="<?= htmlspecialchars($app_root) ?>?page=config&item=host&platform=<?= htmlspecialchars($host_array['platform_id']) ?>&host=<?= htmlspecialchars($host_array['id']) ?>&action=edit">edit host</a>