diff --git a/client/src/components/objective-groups/Objective.vue b/client/src/components/objective-groups/Objective.vue
index 1b7de04d..1ffc52a2 100644
--- a/client/src/components/objective-groups/Objective.vue
+++ b/client/src/components/objective-groups/Objective.vue
@@ -1,5 +1,5 @@
 <template>
-  <li class="objective hideable-element" :class="{'hideable-element--hidden': hidden}">
+  <li class="objective hideable-element" :class="{'hideable-element--hidden': hidden}" v-if="editModule || !hidden">
     <visibility-action
       v-if="editModule"
       :block="objective"></visibility-action>
diff --git a/client/src/components/objective-groups/ObjectiveGroup.vue b/client/src/components/objective-groups/ObjectiveGroup.vue
index dc9387f4..434bbabf 100644
--- a/client/src/components/objective-groups/ObjectiveGroup.vue
+++ b/client/src/components/objective-groups/ObjectiveGroup.vue
@@ -8,7 +8,7 @@
                  :objective="objective" :school-class="currentFilter">
       </objective>
     </ul>
-    <add-content-button :parent="group">
+    <add-content-button :parent="group" v-if="editModule">
     </add-content-button>
   </div>
 
@@ -23,6 +23,8 @@
   import ME_QUERY from '@/graphql/gql/meQuery.gql';
   import AddContentButton from '@/components/AddContentButton';
 
+  import {mapGetters} from 'vuex';
+
   export default {
     props: {
       group: {
@@ -46,6 +48,7 @@
     },
 
     computed: {
+      ...mapGetters(['editModule']),
       canManageContent() {
         return this.me.permissions.includes('users.can_manage_school_class_content');
       },