diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Info.vue b/platypush/backend/http/webapp/src/components/panels/Media/Info.vue
index 2528eda722..135de2e251 100644
--- a/platypush/backend/http/webapp/src/components/panels/Media/Info.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Media/Info.vue
@@ -2,7 +2,7 @@
   <div class="media-info">
     <div class="row header">
       <div class="image-container">
-        <MediaImage :item="item" @play="$emit('play')" />
+        <MediaImage :item="item" @play="$emit('play')" @select="$emit('select')" />
       </div>
 
       <div class="title">
diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Item.vue b/platypush/backend/http/webapp/src/components/panels/Media/Item.vue
index 4ab3c9eb2f..683be50bdc 100644
--- a/platypush/backend/http/webapp/src/components/panels/Media/Item.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Media/Item.vue
@@ -5,7 +5,7 @@
     @click.right.prevent="$refs.dropdown.toggle()"
     v-if="!hidden">
     <div class="thumbnail">
-      <MediaImage :item="item" @play="$emit('play')" />
+      <MediaImage :item="item" @play="$emit('play')" @select="$emit('select')" />
     </div>
 
     <div class="body">
diff --git a/platypush/backend/http/webapp/src/components/panels/Media/MediaImage.vue b/platypush/backend/http/webapp/src/components/panels/Media/MediaImage.vue
index c459a1320f..204a719f3c 100644
--- a/platypush/backend/http/webapp/src/components/panels/Media/MediaImage.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Media/MediaImage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="image-container"
        :class="{ 'with-image': !!item?.image }">
-    <div class="play-overlay" @click="$emit('play', item)" v-if="hasPlay">
+    <div class="play-overlay" @click="$emit(clickEvent, item)" v-if="hasPlay">
       <i :class="overlayIconClass" />
     </div>
 
@@ -40,7 +40,7 @@ import MediaUtils from "@/components/Media/Utils";
 
 export default {
   mixins: [Icons, MediaUtils],
-  emits: ['play'],
+  emits: ['play', 'select'],
   props: {
     item: {
       type: Object,
@@ -60,6 +60,17 @@ export default {
   },
 
   computed: {
+    clickEvent() {
+      switch (this.item?.item_type) {
+        case 'channel':
+        case 'playlist':
+        case 'folder':
+          return 'select'
+        default:
+          return 'play'
+      }
+    },
+
     iconClass() {
       switch (this.item?.item_type) {
         case 'channel':