diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java
index d24c53a1..c4695776 100644
--- a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java
+++ b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java
@@ -8,8 +8,7 @@ import com.kotcrab.vis.ui.widget.*;
 import games.rednblack.editor.HyperLap2DFacade;
 import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Created by azakhary on 8/1/2015.
@@ -17,7 +16,8 @@ import java.util.Set;
 public class TagsPanel extends UIDraggablePanel {
 
     public static final String prefix = "games.rednblack.editor.view.ui.dialog.panels.TagsDialog";
-    public static final String LIST_CHANGED = prefix + ".LIST_CHANGED";
+    public static final String ITEM_ADD = prefix + ".ITEM_ADD";
+    public static final String ITEM_REMOVED = prefix + ".ITEM_REMOVED";
 
     private HyperLap2DFacade facade;
 
@@ -41,7 +41,7 @@ public class TagsPanel extends UIDraggablePanel {
             @Override
             public void removed(String tag) {
                 tags.remove(tag);
-                facade.sendNotification(LIST_CHANGED);
+                facade.sendNotification(ITEM_REMOVED, tag);
             }
         };
     }
@@ -68,7 +68,9 @@ public class TagsPanel extends UIDraggablePanel {
         tagTable = new VisTable();
         VisTable inputTable = new VisTable();
 
-        for(String tag: tags) {
+        List<String> sorted = new LinkedList<>(tags);
+        Collections.sort(sorted);
+        for(String tag: sorted) {
             tagTable.add(new TagItem(tag, tagItemListener)).pad(5).left().expandX().fillX();
             tagTable.row();
         }
@@ -85,7 +87,7 @@ public class TagsPanel extends UIDraggablePanel {
                 if(!tagExists(tag)) {
                     newTagField.setText("");
                     addTag(tag);
-                    facade.sendNotification(LIST_CHANGED);
+                    facade.sendNotification(ITEM_ADD, tag);
                 }
             }
         });
diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanelMediator.java b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanelMediator.java
index 77e27366..f9c14a66 100644
--- a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanelMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanelMediator.java
@@ -43,8 +43,9 @@ public class TagsPanelMediator extends Mediator<TagsPanel> {
                 MsgAPI.ITEM_SELECTION_CHANGED,
                 MsgAPI.EMPTY_SPACE_CLICKED,
                 UIBasicItemProperties.TAGS_BUTTON_CLICKED,
-                TagsPanel.LIST_CHANGED,
-                WindowMenu.TAGS_EDITOR_OPEN
+                WindowMenu.TAGS_EDITOR_OPEN,
+                TagsPanel.ITEM_ADD,
+                TagsPanel.ITEM_REMOVED
         };
     }
 
@@ -67,11 +68,20 @@ public class TagsPanelMediator extends Mediator<TagsPanel> {
             case MsgAPI.EMPTY_SPACE_CLICKED:
                 setObservable(null);
                 break;
-            case TagsPanel.LIST_CHANGED:
+            case TagsPanel.ITEM_REMOVED:
                 viewComponent.updateView();
+                String tagToRemove = notification.getBody();
                 for (Entity observable : observables) {
                     MainItemComponent mainItemComponent = observable.getComponent(MainItemComponent.class);
-                    mainItemComponent.tags.addAll(viewComponent.getTags());
+                    mainItemComponent.tags.remove(tagToRemove);
+                }
+                break;
+            case TagsPanel.ITEM_ADD:
+                viewComponent.updateView();
+                String tagToAdd = notification.getBody();
+                for (Entity observable : observables) {
+                    MainItemComponent mainItemComponent = observable.getComponent(MainItemComponent.class);
+                    mainItemComponent.tags.add(tagToAdd);
                 }
                 break;
         }