diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 23ef80dbb3..c829b5c851 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -144,6 +144,8 @@ require_once "resources/paging.php";
 	echo "<td class='list_control_icons'>";
 	echo "<a href='destination_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	echo "</td>\n";
+	echo "</tr>\n";
+
 	if ($result_count > 0) {
 		foreach($result as $row) {
 			$tr_link = "href='destination_edit.php?id=".$row['destination_uuid']."'";
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 96f4b3be29..414a34165c 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -148,7 +148,7 @@ require_once "resources/paging.php";
 			echo "	<a href='extension_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 		}
 		echo "</td>\n";
-		echo "<tr>\n";
+		echo "</tr>\n";
 
 		if ($result_count > 0) {
 			foreach($result as $row) {
diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php
index 2d3816f752..8f206d131d 100644
--- a/app/sip_profiles/sip_profile_settings.php
+++ b/app/sip_profiles/sip_profile_settings.php
@@ -104,6 +104,8 @@ require_once "resources/paging.php";
 		echo "<a href='sip_profile_setting_edit.php?sip_profile_uuid=".$_GET['id']."' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
 	echo "</td>\n";
+	echo "</tr>\n";
+
 	if ($num_rows > 0) {
 		foreach($result as $row) {
 			$tr_link = (permission_exists('sip_profile_setting_edit')) ? "href='sip_profile_setting_edit.php?sip_profile_uuid=".$row['sip_profile_uuid']."&id=".$row['sip_profile_setting_uuid']."'" : null;
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 00c6c317a6..333a45e302 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -120,6 +120,7 @@ require_once "resources/paging.php";
 		echo "<a href='sip_profile_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
 	echo "</td>\n";
+	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 1bceccb612..6389bd9f55 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -120,7 +120,7 @@ require_once "resources/paging.php";
 	echo "<td class='list_control_icons'>";
 	echo 	"<a href='database_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php
index cf52165a55..2d7d735c8c 100644
--- a/core/domain_settings/domains.php
+++ b/core/domain_settings/domains.php
@@ -173,7 +173,7 @@ else {
 		echo "<a href='domain_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
diff --git a/core/menu/menu.php b/core/menu/menu.php
index 1917174cf1..c21af01dc1 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -113,7 +113,7 @@ require_once "resources/paging.php";
 	echo "<td class='list_control_icons'>";
 	echo "<a href='menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
diff --git a/core/users/users.php b/core/users/users.php
index 738cb2ae20..a6897db922 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -157,7 +157,7 @@ echo "	<td align=\"center\">\n";
 		echo "<a href='signup.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {