diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb
index 2ea4752c4..5438871c1 100644
--- a/app/controllers/concerns/card_scoped.rb
+++ b/app/controllers/concerns/card_scoped.rb
@@ -15,6 +15,6 @@ module CardScoped
     end
 
     def render_card_replacement
-      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", locals: { card: @card.reload })
+      render turbo_stream: turbo_stream.replace([ @card, :card_container ], partial: "cards/container", method: :morph, locals: { card: @card.reload })
     end
 end
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index a817a21af..9c2d11aaf 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -32,10 +32,9 @@
   </div>
 
   <% if card.published? %>
-    <%# 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), data: { turbo_permanent: true } %>
+      <%= turbo_frame_tag card, :pin, src: card_pin_path(card), data: { turbo_permanent: true } %>
     </aside>
 
     <%= render "cards/container/closure", card: card %>