diff --git a/libs/remix-debug/src/debugger/stepManager.ts b/libs/remix-debug/src/debugger/stepManager.ts
index 2cbcc26879..e8cd462564 100644
--- a/libs/remix-debug/src/debugger/stepManager.ts
+++ b/libs/remix-debug/src/debugger/stepManager.ts
@@ -97,7 +97,7 @@ export class DebuggerStepManager {
     if (!this.traceManager.inRange(step)) {
       return
     }
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   stepIntoForward (solidityMode) {
@@ -110,7 +110,7 @@ export class DebuggerStepManager {
     if (!this.traceManager.inRange(step)) {
       return
     }
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   stepOverBack (solidityMode) {
@@ -120,7 +120,7 @@ export class DebuggerStepManager {
       step = this.resolveToReducedTrace(step, -1)
     }
     this.currentStepIndex = step
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   stepOverForward (solidityMode) {
@@ -135,7 +135,7 @@ export class DebuggerStepManager {
       step = this.resolveToReducedTrace(step, 1)
     }
     this.currentStepIndex = step
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   jumpOut (solidityMode) {
@@ -145,13 +145,13 @@ export class DebuggerStepManager {
       step = this.resolveToReducedTrace(step, 0)
     }
     this.currentStepIndex = step
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   jumpTo (step) {
     if (!this.traceManager.inRange(step)) return
     this.currentStepIndex = step
-    this.event.trigger('stepChanged', [step])
+    this.triggerStepChanged(step)
   }
 
   jumpToException () {
diff --git a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
index 55ffc569b4..680c3b9ef8 100644
--- a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
@@ -45,7 +45,7 @@ export const ButtonNavigation = ({ stepOverBack, stepIntoBack, stepIntoForward,
         intoForwardDisabled: stepState === 'end',
         overForwardDisabled: stepState === 'end',
         jumpNextBreakpointDisabled: stepState === 'end',
-        jumpOutDisabled: jumpOutDisabled || true
+        jumpOutDisabled: (jumpOutDisabled !== null) && (jumpOutDisabled !== undefined) ? jumpOutDisabled : true
       }
     })
   }