diff --git a/app/controllers/cards/watches_controller.rb b/app/controllers/cards/watches_controller.rb
index bd956a2d5..7556e2000 100644
--- a/app/controllers/cards/watches_controller.rb
+++ b/app/controllers/cards/watches_controller.rb
@@ -3,11 +3,11 @@ class Cards::WatchesController < ApplicationController
 
   def create
     @card.watch_by Current.user
-    redirect_to card_watch_path(@card)
+    redirect_back_or_to @card
   end
 
   def destroy
     @card.unwatch_by Current.user
-    redirect_to card_watch_path(@card)
+    redirect_back_or_to @card
   end
 end
diff --git a/app/views/cards/container/footer/_published.html.erb b/app/views/cards/container/footer/_published.html.erb
index c4e0a0cdf..c227f7f3c 100644
--- a/app/views/cards/container/footer/_published.html.erb
+++ b/app/views/cards/container/footer/_published.html.erb
@@ -1,7 +1,7 @@
 <%# FIXME: Let's move this aside outside of the card container section so these frames don't reload/flicker when card is replaced %>
 <aside class="card-perma__actions card-perma__actions--right" role="toolbar">
-  <%= turbo_frame_tag card, :watch, src: card_watch_path(card) %>
-  <%= turbo_frame_tag card, :pin, src: card_pin_path(card) %>
+  <%= turbo_frame_tag card, :watch, src: card_watch_path(card), target: "_top", refresh: :morph %>
+  <%= turbo_frame_tag card, :pin, src: card_pin_path(card), refresh: :morph %>
 </aside>
 
 <%= render "cards/container/closure", card: card %>