diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index b315df289c..c648873dd5 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -830,14 +830,17 @@ table tr:nth-last-child(-5) td:first-of-type {
 					<?php
 					$bgcolor1 = "#eaedf2";
 					$bgcolor2 = "#fff";
-					if (is_array($_SESSION['domains'])) {
-						foreach($_SESSION['domains'] as $domain) {
-							if ($domain['domain_uuid'] != $_SESSION['domain_uuid']) {
-								$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
-								?><div id="<?=$domain['domain_name']?>" class="domains_list_item" style="background-color: <?=$bgcolor?>" onclick="document.location.href='<?=PROJECT_PATH?>/core/domain_settings/domains.php?domain_uuid=<?=$domain['domain_uuid']?>&domain_change=true';"><a href="<?=PROJECT_PATH?>/core/domain_settings/domains.php?domain_uuid=<?=$domain['domain_uuid']?>&domain_change=true"><?=$domain['domain_name']?></a><? if ($domain['domain_description'] != '') { ?><span class="domain_list_item_description"> - <?=$domain['domain_description']?></span><? } ?></div><?
-								$ary_domain_names[] = $domain['domain_name'];
-								$ary_domain_descs[] = str_replace('"','\"',$domain['domain_description']);
+					foreach($_SESSION['domains'] as $domain) {
+						if ($domain['domain_uuid'] != $_SESSION['domain_uuid']) {
+							$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
+							echo "<div id=\"".$domain['domain_name']."\" class=\"domains_list_item\" style=\"background-color: ".$bgcolor."\" onclick=\"document.location.href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".$domain['domain_uuid']."&domain_change=true';\">";
+							echo "<a href=\"".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=\"".$domain['domain_uuid']."\"&domain_change=true\">".$domain['domain_name']."</a>\n";
+							if ($domain['domain_description'] != '') {
+								echo "<span class=\"domain_list_item_description\"> - ".$domain['domain_description']."</span>\n";
 							}
+							echo "</div>\n";
+							$ary_domain_names[] = $domain['domain_name'];
+							$ary_domain_descs[] = str_replace('"','\"',$domain['domain_description']);
 						}
 					}
 					?>