diff --git a/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js b/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js
index b799c0cc59..936eeb31bf 100644
--- a/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js
+++ b/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js
@@ -173,7 +173,7 @@ Ethdebugger.prototype.startDebugging = function (blockNumber, txIndex, tx) {
       yo.update(self.view, self.render())
       self.event.trigger('newTraceLoaded', [self.traceManager.trace])
       if (self.breakpointManager && self.breakpointManager.hasBreakpoint()) {
-        self.breakpointManager.jumpNextBreakpoint(false)
+        self.breakpointManager.jumpNextBreakpoint(0, false)
       }
     } else {
       self.statusMessage = error ? error.message : 'Trace not loaded'
diff --git a/src/app/debugger/remix-debugger/src/ui/StepManager.js b/src/app/debugger/remix-debugger/src/ui/StepManager.js
index eaa2ec0d85..040c9dff2f 100644
--- a/src/app/debugger/remix-debugger/src/ui/StepManager.js
+++ b/src/app/debugger/remix-debugger/src/ui/StepManager.js
@@ -65,10 +65,10 @@ function StepManager (_parent, _traceManager) {
     self.jumpTo(exceptionIndex)
   })
   this.buttonNavigator.event.register('jumpNextBreakpoint', (exceptionIndex) => {
-    self.parent.breakpointManager.jumpNextBreakpoint(true)
+    self.parent.breakpointManager.jumpNextBreakpoint(this.parent.currentStepIndex, true)
   })
   this.buttonNavigator.event.register('jumpPreviousBreakpoint', (exceptionIndex) => {
-    self.parent.breakpointManager.jumpPreviousBreakpoint(true)
+    self.parent.breakpointManager.jumpPreviousBreakpoint(this.parent.currentStepIndex, true)
   })
 }