diff --git a/catalog/static/js/podcast.js b/catalog/static/js/podcast.js
index 0285860d..73513899 100644
--- a/catalog/static/js/podcast.js
+++ b/catalog/static/js/podcast.js
@@ -15,6 +15,18 @@ function create_player(audio) {
   // });
   $('.footer').attr('style', 'margin-bottom: 120px !important');
 }
+function set_podcast_comment_button(comment_href) {
+  if (window.comment_btn){
+    window.comment_btn.remove();
+  }
+  if (comment_href) {
+    window.comment_btn = $('<button class="shk-btn shk-btn_comment" title="comment this episode" aria-label="comment" hx-get="'+comment_href+'" hx-target="body" hx-swap="beforeend"> <svg aria-hidden="true" width="16" height="16" fill="currentColor" class="bi bi-chat-dots" viewBox="0 0 16 16"> <path d="M5 8a1 1 0 1 1-2 0 1 1 0 0 1 2 0m4 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 1a1 1 0 1 0 0-2 1 1 0 0 0 0 2"/> <path d="m2.165 15.803.02-.004c1.83-.363 2.948-.842 3.468-1.105A9 9 0 0 0 8 15c4.418 0 8-3.134 8-7s-3.582-7-8-7-8 3.134-8 7c0 1.76.743 3.37 1.97 4.6a10.4 10.4 0 0 1-.524 2.318l-.003.011a11 11 0 0 1-.244.637c-.079.186.074.394.273.362a22 22 0 0 0 .693-.125m.8-3.108a1 1 0 0 0-.287-.801C1.618 10.83 1 9.468 1 8c0-3.192 3.004-6 7-6s7 2.808 7 6-3.004 6-7 6a8 8 0 0 1-2.088-.272 1 1 0 0 0-.711.074c-.387.196-1.24.57-2.634.893a11 11 0 0 0 .398-2"/> </svg> </button>')[0];
+    window.player.ui.extraControls.append(window.comment_btn);
+    htmx.process(window.comment_btn);
+    // $('<button class="shk-btn shk-btn_info" title="open podcast page" aria-label="info"> <svg aria-hidden="true" width="16" height="16" fill="currentColor" class="bi bi-info-lg" viewBox="0 0 16 16"> <path d="m9.708 6.075-3.024.379-.108.502.595.108c.387.093.464.232.38.619l-.975 4.577c-.255 1.183.14 1.74 1.067 1.74.72 0 1.554-.332 1.933-.789l.116-.549c-.263.232-.65.325-.905.325-.363 0-.494-.255-.402-.704zm.091-2.755a1.32 1.32 0 1 1-2.64 0 1.32 1.32 0 0 1 2.64 0"/> </svg> </button>');
+    // $('<button class="shk-btn shk-btn_mark" title="mark this podcast" aria-label="mark"> <svg aria-hidden="true" width="16" height="16" fill="currentColor" class="bi bi-bookmark" viewBox="0 0 16 16"> <path d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v13.5a.5.5 0 0 1-.777.416L8 13.101l-5.223 2.815A.5.5 0 0 1 2 15.5zm2-1a1 1 0 0 0-1 1v12.566l4.723-2.482a.5.5 0 0 1 .554 0L13 14.566V2a1 1 0 0 0-1-1z"/> </svg> </button>');
+  }
+}
 function podcast_init(context) {
   $('.episode', context).on('click', e=>{
     e.preventDefault();
@@ -25,6 +37,7 @@ function podcast_init(context) {
     var cover_url = $(ele).data('cover');
     var media_url = $(ele).data('media');
     var position = $(ele).data('position');
+    var comment_href = $(ele).data('comment-href');
     if (!media_url) return;
     window.current_item_uuid = $(ele).data('uuid');
     if (!window.player) {
@@ -44,6 +57,7 @@ function podcast_init(context) {
         artist: artist
       })
     }
+    set_podcast_comment_button(comment_href);
     if (position) window.player._initSeek = position;
     window.player.play()
   });
diff --git a/catalog/templates/_item_comments.html b/catalog/templates/_item_comments.html
index c0bb78f1..472bd35c 100644
--- a/catalog/templates/_item_comments.html
+++ b/catalog/templates/_item_comments.html
@@ -40,9 +40,10 @@
                data-position="{{ comment.metadata.position|default:0 }}"
                data-cover="{{ comment.item.cover_url|default:item.cover.url }}"
                class="episode"
-               data-hosts="{{ comment.item.hosts|join:' / ' }}"
+               data-hosts="{{ item.hosts|join:' / ' }}"
                data-title="{{ comment.item.title }}"
                data-album="{{ item.title }}"
+               {% if request.user.is_authenticated %} data-comment-href="{% url 'journal:comment' comment.item.uuid %}" {% endif %}
                data-uuid="{{ comment.item.uuid }}"><i class="fa-regular fa-circle-play"></i></a>
           </span>
         {% endif %}
diff --git a/catalog/templates/podcast.html b/catalog/templates/podcast.html
index 2788d9ec..313fe64a 100644
--- a/catalog/templates/podcast.html
+++ b/catalog/templates/podcast.html
@@ -87,6 +87,9 @@ $(()=>{
 		artist: "{{ item.hosts|join:' / '|escapejs }}"
 	})
 	if (position) window.player._initSeek = position;
+  {% if request.user.is_authenticated %}
+  set_podcast_comment_button("{% url 'journal:comment' focus_item.uuid %}")
+  {% endif %}
 	{% endif %}
 });
   </script>
diff --git a/catalog/templates/podcast_episode_data.html b/catalog/templates/podcast_episode_data.html
index 70401c95..7fd3896c 100644
--- a/catalog/templates/podcast_episode_data.html
+++ b/catalog/templates/podcast_episode_data.html
@@ -13,6 +13,7 @@
          data-title="{{ ep.title }}"
          data-album="{{ item.title }}"
          data-hosts="{{ item.hosts|join:' / ' }}"
+         {% if request.user.is_authenticated %} data-comment-href="{% url 'journal:comment' ep.uuid %}" {% endif %}
          style="top:4px;
                 margin-right: 8px"></a>
       &nbsp;
diff --git a/common/templates/_sidebar.html b/common/templates/_sidebar.html
index 7a160281..0e2f6132 100644
--- a/common/templates/_sidebar.html
+++ b/common/templates/_sidebar.html
@@ -123,6 +123,7 @@
                      data-title="{{ item.title }}"
                      data-album="{{ item.program.title }}"
                      data-hosts="{{ item.program.hosts|join:' / ' }}"
+                     {% if request.user.is_authenticated %} data-comment-href="{% url 'journal:comment' item.uuid %}" {% endif %}
                      data-position="0"
                      href="{{ item.url }}"
                      title="{{ item.title }}">
diff --git a/social/templates/activity/comment_child_item.html b/social/templates/activity/comment_child_item.html
index 713513c4..f947b824 100644
--- a/social/templates/activity/comment_child_item.html
+++ b/social/templates/activity/comment_child_item.html
@@ -21,6 +21,7 @@
          data-title="{{ activity.action_object.item.title }}"
          data-album="{{ activity.action_object.item.parent_item.title }}"
          data-hosts="{{ activity.action_object.item.parent_item.hosts|join:' / ' }}"
+         {% if request.user.is_authenticated %} data-comment-href="{% url 'journal:comment' activity.action_object.item.uuid %}" {% endif %}
          data-position="{{ activity.action_object.metadata.position | default:0 }}"><i class="fa-solid fa-circle-play"></i></a>
     </span>
   {% endif %}