diff --git a/app/assets/javascripts/app/controllers/tags.js b/app/assets/javascripts/app/controllers/tags.js
index 76f11ddf2..575011f58 100644
--- a/app/assets/javascripts/app/controllers/tags.js
+++ b/app/assets/javascripts/app/controllers/tags.js
@@ -62,7 +62,6 @@ angular.module('app')
 
     componentManager.registerHandler({identifier: "tags", areas: ["tags-list"], activationHandler: function(component){
       this.component = component;
-
     }.bind(this), contextRequestHandler: function(component){
       return null;
     }.bind(this), actionHandler: function(component, action, data){
diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index 4082df661..55072029e 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -376,7 +376,7 @@ class ComponentManager {
     for(let handler of this.handlersForArea(component.area)) {
       if(handler.contextRequestHandler) {
         var itemInContext = handler.contextRequestHandler(component);
-        if(itemInContext.uuid == item.uuid) {
+        if(itemInContext && itemInContext.uuid == item.uuid) {
           return true;
         }
       }
diff --git a/app/assets/templates/tags.html.haml b/app/assets/templates/tags.html.haml
index cbbc9d214..ccab40f7e 100644
--- a/app/assets/templates/tags.html.haml
+++ b/app/assets/templates/tags.html.haml
@@ -1,5 +1,5 @@
 .section.tags#tags-column
-  .component-view-container{"ng-if" => "ctrl.component"}
+  .component-view-container{"ng-if" => "ctrl.component.active"}
     %component-view.component-view{"component" => "ctrl.component"}
   #tags-content.content{"ng-if" => "!(ctrl.component && ctrl.component.active)"}
     #tags-title-bar.section-title-bar