diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 40accf7347..1de6987624 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -247,24 +247,9 @@ class acp_extensions
 		{
 			$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
 
-			$enabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
-		}
-
-		natcasesort($enabled_extension_meta_data);
-
-		foreach ($enabled_extension_meta_data as $name => $display_name)
-		{
 			try
 			{
-				$this->template->assign_block_vars('enabled', array(
-					'META_DISPLAY_NAME'		=> $display_name,
-
-					'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
-				));
-
-				$this->output_actions('enabled', array(
-					'DISABLE'		=> $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
-				));
+				$enabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
 			}
 			catch(\phpbb\extension\exception $e)
 			{
@@ -273,6 +258,21 @@ class acp_extensions
 				));
 			}
 		}
+
+		natcasesort($enabled_extension_meta_data);
+
+		foreach ($enabled_extension_meta_data as $name => $display_name)
+		{
+			$this->template->assign_block_vars('enabled', array(
+				'META_DISPLAY_NAME'		=> $display_name,
+
+				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
+			));
+
+			$this->output_actions('enabled', array(
+				'DISABLE'		=> $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
+			));
+		}
 	}
 
 	/**
@@ -289,25 +289,9 @@ class acp_extensions
 		{
 			$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
 
-			$disabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
-		}
-
-		natcasesort($disabled_extension_meta_data);
-
-		foreach ($disabled_extension_meta_data as $name => $display_name)
-		{
 			try
 			{
-				$this->template->assign_block_vars('disabled', array(
-					'META_DISPLAY_NAME'		=> $display_name,
-
-					'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
-				));
-
-				$this->output_actions('disabled', array(
-					'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
-					'DELETE_DATA'	=> $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
-				));
+				$disabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
 			}
 			catch(\phpbb\extension\exception $e)
 			{
@@ -316,6 +300,22 @@ class acp_extensions
 				));
 			}
 		}
+
+		natcasesort($disabled_extension_meta_data);
+
+		foreach ($disabled_extension_meta_data as $name => $display_name)
+		{
+			$this->template->assign_block_vars('disabled', array(
+				'META_DISPLAY_NAME'		=> $display_name,
+
+				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
+			));
+
+			$this->output_actions('disabled', array(
+				'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
+				'DELETE_DATA'	=> $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
+			));
+		}
 	}
 
 	/**
@@ -334,24 +334,9 @@ class acp_extensions
 		{
 			$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
 
-			$available_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
-		}
-
-		natcasesort($available_extension_meta_data);
-
-		foreach ($available_extension_meta_data as $name => $display_name)
-		{
 			try
 			{
-				$this->template->assign_block_vars('disabled', array(
-					'META_DISPLAY_NAME'		=> $display_name,
-
-					'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
-				));
-
-				$this->output_actions('disabled', array(
-					'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
-				));
+				$available_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
 			}
 			catch(\phpbb\extension\exception $e)
 			{
@@ -360,6 +345,21 @@ class acp_extensions
 				));
 			}
 		}
+
+		natcasesort($available_extension_meta_data);
+
+		foreach ($available_extension_meta_data as $name => $display_name)
+		{
+			$this->template->assign_block_vars('disabled', array(
+				'META_DISPLAY_NAME'		=> $display_name,
+
+				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . urlencode($name),
+			));
+
+			$this->output_actions('disabled', array(
+				'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
+			));
+		}
 	}
 
 	/**