diff --git a/functions.php b/functions.php
index 5fc20841a..336a6d4b9 100644
--- a/functions.php
+++ b/functions.php
@@ -1913,7 +1913,8 @@
 		$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) 
 			FROM ttrss_user_entries WHERE int_id = post_int_id 
 				AND unread = true)) AS count FROM ttrss_tags 
-			WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name ORDER BY tag_name");
+				WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name 
+				ORDER BY count DESC LIMIT 55");
 			
 		$tags = array();
 
@@ -3474,7 +3475,8 @@
 			$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) 
 				FROM ttrss_user_entries WHERE int_id = post_int_id 
 					AND unread = true)) AS count FROM ttrss_tags 
-				WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name ORDER BY tag_name");
+					WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name 
+					ORDER BY count DESC LIMIT 50");
 
 			$tags = array();
 	
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 562093d9d..6590159d2 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -424,7 +424,7 @@
 			print "<div class=\"infoBoxContents\">";
 
 			print __("Showing most popular tags ")." (<a 
-				href='javascript:toggleTags(true)'>".__('browse all')."</a>):<br/>";
+			href='javascript:toggleTags(true)'>".__('browse more')."</a>):<br/>"; 
 
 			print "<div class=\"tagCloudContainer\">";