diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
index da99536b..1f3b6712 100644
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ b/wise-webapp/src/main/webapp/css/mindmapList.less
@@ -115,15 +115,22 @@ input#selectAll {
     -moz-border-radius: 3px;
     border-radius: 3px;
     background-color: black;
-
+    float: left;
+}
+.labelIcon {
+  float: left;
 }
-
 .labelName {
     display: inline-block;
     position: relative;
     left: 7px;
 }
 
+.labelNameList {
+  max-width: 120px;
+  word-wrap: break-word;
+}
+
 .labelTag {
   border: 1px solid;
   border-radius: 4px;
diff --git a/wise-webapp/src/main/webapp/js/labelActions.js b/wise-webapp/src/main/webapp/js/labelActions.js
index 1188a024..191add98 100644
--- a/wise-webapp/src/main/webapp/js/labelActions.js
+++ b/wise-webapp/src/main/webapp/js/labelActions.js
@@ -3,9 +3,9 @@ function createLabelItem(data, id) {
     $("#foldersContainer").find("ul").append(
         $("<li data-filter=\""  + data.title  + "\">").append(
             "<a href=\"#\"> " +
-                "<i class=\"icon-tag\"></i>" +
+                "<i class=\"icon-tag labelIcon\"></i>" +
                 "<div class='labelColor' style='background: " +  data.color + "'></div>" +
-                "<div class='labelName'>" + data.title + "</div>" +
+                "<div class='labelName labelNameList'>" + data.title + "</div>" +
                 "<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
             "</a>"
         )