diff --git a/remix-debug/src/debugger/VmDebugger.js b/remix-debug/src/debugger/VmDebugger.js
index 51c93bb0c4..1ec8029e23 100644
--- a/remix-debug/src/debugger/VmDebugger.js
+++ b/remix-debug/src/debugger/VmDebugger.js
@@ -169,8 +169,8 @@ class VmDebuggerLogic {
       if (index < 0) return
       if (self.stepManager.currentStepIndex !== index) return
       if (!self.storageResolver) return
-
-      if (index !== self.traceLength - 1) {
+      // Clean up storage update
+      if (index === self.traceLength - 1) {
         return self.event.trigger('traceStorageUpdate', [{}])
       }
       var storageJSON = {}
diff --git a/remix-debug/src/debugger/debugger.js b/remix-debug/src/debugger/debugger.js
index d7813c6fa1..4f5f5f92c7 100644
--- a/remix-debug/src/debugger/debugger.js
+++ b/remix-debug/src/debugger/debugger.js
@@ -128,6 +128,7 @@ Debugger.prototype.debugTx = function (tx, loadingCb) {
     self.debugger.codeManager.resolveStep(stepIndex, tx)
     self.step_manager.event.trigger('indexChanged', [stepIndex])
     self.vmDebuggerLogic.event.trigger('indexChanged', [stepIndex])
+    self.vmDebuggerLogic.debugger.event.trigger('indexChanged', [stepIndex])
     self.registerAndHighlightCodeItem(stepIndex)
   })