diff --git a/src/ui/Ethdebugger.js b/src/ui/Ethdebugger.js
index 9c2f49b886..cdd037f6e7 100644
--- a/src/ui/Ethdebugger.js
+++ b/src/ui/Ethdebugger.js
@@ -52,6 +52,14 @@ function Ethdebugger () {
     self.stepChanged(stepIndex)
   })
   this.vmDebugger = new VmDebugger(this, this.traceManager, this.codeManager, this.solidityProxy, callTree)
+
+  this.codeManager.event.register('changed', this, (code, address, instIndex) => {
+    this.callTree.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, this.currentStepIndex, this.solidityProxy.contracts, (error, sourceLocation) => {
+      if (!error) {
+        this.event.trigger('sourceLocationChanged', [sourceLocation])
+      }
+    })
+  })
 }
 
 Ethdebugger.prototype.web3 = function () {