diff --git a/functions.php b/functions.php
index ff64a0a70..11d1d8c04 100644
--- a/functions.php
+++ b/functions.php
@@ -4044,13 +4044,25 @@
 					$tags = get_article_tags($link, $id);
 
 					$tags_str = "";
+					$full_tags_str = "";
 
 					foreach ($tags as $tag) {
 						$num_tags++;
-						$tags_str .= "<a href=\"javascript:viewfeed('$tag')\">$tag</a>, "; 
+						$full_tags_str .= "<a href=\"javascript:viewfeed('$tag')\">$tag</a>, "; 
+						if ($num_tags < 5) {
+							$tags_str .= "<a href=\"javascript:viewfeed('$tag')\">$tag</a>, "; 
+						} else if ($num_tags == 5) {
+							$tags_str .= "...";
+						}
 					}
 
 					$tags_str = preg_replace("/, $/", "", $tags_str);
+					$full_tags_str = preg_replace("/, $/", "", $full_tags_str);
+
+					$all_tags_div = "<span class='cdmAllTagsCtr'>...<div class='cdmAllTags'>All Tags: $full_tags_str</div></span>";
+
+					$tags_str = preg_replace("/\.\.\.$/", "$all_tags_div", $tags_str);
+
 
 					if ($tags_str == "") $tags_str = "no tags";
 
diff --git a/tt-rss.css b/tt-rss.css
index 39ae0bdc8..7cdbaf0b3 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -849,6 +849,22 @@ td.hlFeed {
 	background-color : white;
 } */
 
+div.cdmAllTags {
+	width : 75%;
+	float : left;
+	background-color : white;
+	border : 1px solid #c0c0c0;
+	display : none;
+	z-index : 3;
+	top : auto;
+	left : auto;
+	position : absolute;
+}
+
+span.cdmAllTagsCtr:hover div {
+	display : block;
+}
+
 div.cdmArticle {
 	border-color : #a0a0a0;
 	border-width : 0px 0px 1px 0px;