diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 426642ef7..8c86acb1f 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -109,8 +109,10 @@ angular.module('app.frontend')
       }
 
       else if(action === "associate-item") {
-        var tag = modelManager.findItem(data.item.uuid);
-        this.addTag(tag);
+        if(data.item.content_type == "Tag") {
+          var tag = modelManager.findItem(data.item.uuid);
+          this.addTag(tag);
+        }
       }
 
       else if(action === "deassociate-item") {