diff --git a/app/controllers/account/valuations_controller.rb b/app/controllers/account/valuations_controller.rb
index 7d975012..e3015bde 100644
--- a/app/controllers/account/valuations_controller.rb
+++ b/app/controllers/account/valuations_controller.rb
@@ -12,7 +12,7 @@ class Account::ValuationsController < ApplicationController
 
     if @entry.save
       @entry.sync_account_later
-      redirect_to account_valuations_path(@account), notice: t(".success")
+      redirect_back_or_to account_valuations_path(@account), notice: t(".success")
     else
       flash[:alert] = @entry.errors.full_messages.to_sentence
       redirect_to account_path(@account)
diff --git a/app/views/account/valuations/_valuation.html.erb b/app/views/account/valuations/_valuation.html.erb
index 30bfa6ab..895c5c9c 100644
--- a/app/views/account/valuations/_valuation.html.erb
+++ b/app/views/account/valuations/_valuation.html.erb
@@ -33,7 +33,7 @@
     <div class="col-span-1 justify-self-end">
       <%= contextual_menu do %>
         <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= contextual_menu_modal_action_item t(".edit_entry"), edit_account_entry_path(account, entry) %>
+          <%= contextual_menu_modal_action_item t(".edit_entry"), edit_account_entry_path(account, entry), turbo_frame: dom_id(entry) %>
 
           <%= contextual_menu_destructive_item t(".delete_entry"),
                                                account_entry_path(account, entry),