diff --git a/html/sites/all/modules/contrib/active_tags/active_tags.js b/html/sites/all/modules/contrib/active_tags/active_tags.js
index d417b5e..468fb73 100644
--- a/html/sites/all/modules/contrib/active_tags/active_tags.js
+++ b/html/sites/all/modules/contrib/active_tags/active_tags.js
@@ -44,12 +44,18 @@ function activetags_check_enter(event) {
   }
 }
 
-function activetags_add(context, v) {
-  if (jQuery.trim(v) != '') {
-    $(context).prev().children('.tag-holder').append('<div class="tag-tag"><span class="tag-text">' +
-      jQuery.trim(v) + '</span><span class="remove-tag">x</span></div>');
+function activetags_add(context, v, class) {
+  class = class || '';
+  v = jQuery.trim(v);
+  if (v != '') {
+    $(context).prev().children('.tag-holder').append('<div class="tag-tag ' + class +'"><span class="tag-text">' +
+      v + '</span><span class="remove-tag">x</span></div>');
     $('.remove-tag:not(.tag-processed)').click(function() {
       $(this).parent().remove();
+      // if a popular tag, readd to the popular list
+      if (class == 'popular') {
+        $('.pop-tags').append(Drupal.theme('activeTagPopular', v));
+      }
       activetags_update(context);
     }).addClass('tag-processed');
   }
diff --git a/html/sites/all/modules/contrib/active_tags/active_tags_popular.js b/html/sites/all/modules/contrib/active_tags/active_tags_popular.js
index 55546b9..af559e7 100644
--- a/html/sites/all/modules/contrib/active_tags/active_tags_popular.js
+++ b/html/sites/all/modules/contrib/active_tags/active_tags_popular.js
@@ -26,7 +26,7 @@ function activetags_popular_activate(context) {
         return str.indexOf($(this).text()) >= 0;
       }).parent().remove();
       $contextChildren.children('.add-tag-popular').click(function () {
-        activetags_add(context, $(this).prev().text());
+        activetags_add(context, $(this).prev().text(), 'popular');
         activetags_update(context);
         $(this).parent().remove();
       });
@@ -40,8 +40,15 @@ function activetags_popular_activate(context) {
 function activetags_popular_widget(context,tags) {
   var content = '<div class="pop-tags">' + Drupal.t('Add popular tags: ');
   jQuery.each(tags, function (i, v) {
-    tagitem = '<div class="tag-popular"><span class="tag-text">' + v + '</span><span class="add-tag-popular">+</span></div>';
-    content = content + tagitem;
+    content += Drupal.theme('activeTagPopular', v);
   });
   return content + '</div>';
 }
+
+/**
+ * Theme a popular tag.
+ */
+Drupal.theme.prototype.activeTagPopular = function(value, addSign) {
+  addSign = addSign || '+';
+  return '<div class="tag-popular"><span class="tag-text">' + value + '</span><span class="add-tag-popular">'+ addSign +'</span></div>';
+};