diff --git a/app/components/public/index/activities.hbs b/app/components/public/index/activities.hbs
index f81284d51..ad21fb370 100644
--- a/app/components/public/index/activities.hbs
+++ b/app/components/public/index/activities.hbs
@@ -22,7 +22,7 @@
 {{#if modalIsOpen}}
   <EmberWormhole @to='ember-wormhole-destination'>
     <div class='public-index-activity-modal modal d-block'>
-      <div class='activity-modal-backdrop' {{action 'closeModal'}}></div>
+      <div class='activity-modal-backdrop' {{on 'click' closeModal}}></div>
       <div class='activity-modal-content-wrapper modal-dialog' role='document'>
         <div class='modal-content'>
           <div class='modal-body'>
diff --git a/app/components/public/index/youtube-videos.hbs b/app/components/public/index/youtube-videos.hbs
index d274c794c..b71d125c7 100644
--- a/app/components/public/index/youtube-videos.hbs
+++ b/app/components/public/index/youtube-videos.hbs
@@ -17,7 +17,7 @@
               <div
                 class='public-index-videos__video'
                 title='{{video.title}}'
-                {{action 'changeVideo' video}}
+                {{on 'click' (fn changeVideo video)}}
               >
                 <img
                   src='https://img.youtube.com/vi/{{video.videoId}}/maxresdefault.jpg'
diff --git a/app/templates/activities/activity/print-enrolled.hbs b/app/templates/activities/activity/print-enrolled.hbs
index 1c3deb56b..6ae016c10 100644
--- a/app/templates/activities/activity/print-enrolled.hbs
+++ b/app/templates/activities/activity/print-enrolled.hbs
@@ -48,19 +48,19 @@
               <br />
               <ul
                 class='list-group'
-                {{sortable-group onChange=(action 'reorderItems')}}
+                {{sortable-group onChange=reorderItems}}
               >
                 {{#each this.options as |option index|}}
                   <li class='list-group-item' {{sortable-item model=option}}>
                     <div class='row'>
                       <span class='col'>{{option}}</span>
                       <a
-                        class='ps-2 link-highlight text-danger'
-                        {{action 'removeOption' index}}
+                        class='col ps-2 link-highlight text-danger'
+                        {{on 'click' (fn removeOption index)}}
                       >
                         Verwijderen
                       </a>
-                      <span class='px-3' {{sortable-handle}}>
+                      <span class='col px-3' {{sortable-handle}}>
                         <FaIcon @icon='sort' class='handle text-muted' />
                       </span>
                     </div>