diff --git a/wise-webapp/src/main/webapp/js/labelActions.js b/wise-webapp/src/main/webapp/js/labelActions.js
index d829581a..0bed22df 100644
--- a/wise-webapp/src/main/webapp/js/labelActions.js
+++ b/wise-webapp/src/main/webapp/js/labelActions.js
@@ -1,7 +1,4 @@
 function createLabelItem(data) {
-    if (data.color == "") {
-        data.color = "#000000";
-    }
     $("#foldersContainer").find("ul").append(
         $("<li data-filter=\""  + data.title  + "\">").append(
             "<a href=\"#\"> <i class=\"icon-tag\"></i>" +
@@ -10,7 +7,15 @@ function createLabelItem(data) {
             "</a>"
         )
     )
+}
 
+function labelTagsAsHtml(labels) {
+    var result = "";
+    for (var i = 0; i<labels.length; i++) {
+        var label = labels[i];
+        result+= "<div class='labelTag' style='background-color:" + label.color + "'>"+ label.title + "</div>"
+    }
+    return result;
 }
 
 function fetchLabels(options) {
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 00a52900..3d682206 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -62,7 +62,7 @@
                         bUseRendered:false,
                         mDataProp:"title",
                         fnRender:function (obj) {
-                            return '<span class="icon-file icon-blue"></span>' + '<a href="c/maps/' + obj.aData.id + '/edit">' + $('<span></span>').text(obj.aData.title).html() + '</a>';
+                            return '<span class="icon-file icon-blue"></span>' + '<a href="c/maps/' + obj.aData.id + '/edit">' + $('<span></span>').text(obj.aData.title).html() + labelTagsAsHtml(obj.aData.labels) + '</a>';
                         }
                     },
                     {