diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f3c0d516af..a206f5b1b0 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -52,9 +52,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		$avatar_list = $this->get_avatar_list();
 		$category = $this->request->variable('av_local_cat', '');
 
-		$categories = array_keys($avatar_list);
-
-		foreach ($categories as $cat)
+		foreach ($avatar_list as $cat => $null)
 		{
 			if (!empty($avatar_list[$cat]))
 			{
@@ -63,6 +61,11 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					'SELECTED' => ($cat == $category),
 				));
 			}
+			
+			if ($cat != $category)
+			{
+				unset($avatar_list[$cat]);
+			}
 		}
 
 		if (!empty($avatar_list[$category]))