diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 94d7717539..9d991d6475 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -70,7 +70,7 @@ require_once "resources/paging.php";
 
 	//prepare to page the results
 		$sql = "select count(*) as num_rows from v_default_settings ";
-		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; }
 		$prep_statement = $db->prepare($sql);
 		if ($prep_statement) {
 		$prep_statement->execute();
@@ -94,7 +94,7 @@ require_once "resources/paging.php";
 	//get the list
 		$sql = "select * from v_default_settings ";
 		if (strlen($order_by) == 0) {
-			$sql .= "order by default_setting_category, default_setting_subcategory asc ";
+			$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc ";
 		}
 		else {
 			$sql .= "order by $order_by $order ";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index f8cbbb0cab..c5c2794925 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -89,7 +89,7 @@ require_once "resources/paging.php";
 		$sql = "select * from v_domain_settings ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		if (strlen($order_by) == 0) {
-			$sql .= "order by domain_setting_category, domain_setting_subcategory asc ";
+			$sql .= "order by domain_setting_category, domain_setting_subcategory, domain_setting_order asc ";
 		}
 		else {
 			$sql .= "order by $order_by $order ";