diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index edc69528cd..aacd16cb2a 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -158,11 +158,11 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   listenToEvents () {
-    this.data.eventHandlers.onContentChanged = () => {
+    this.on('editor', 'contentChanged', () => {
       this.emit('statusChanged', { key: 'edited', title: 'the content has changed, needs recompilation', type: 'info' })
-    }
-    this.on('editor', 'contentChanged', this.data.eventHandlers.onContentChanged)
-    
+      if (this.onContentChanged) this.onContentChanged()
+    })
+
     this.data.eventHandlers.onLoadingCompiler = () => {
       this.data.loading = true
       this.emit('statusChanged', { key: 'loading', title: 'loading compiler...', type: 'info' })
@@ -195,11 +195,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
 
     this.on('editor', 'sessionSwitched', () => {
       if (this.onSessionSwitched) this.onSessionSwitched()
-    })
-
-    this.on('editor', 'contentChanged', () => {
-      if (this.onContentChanged) this.onContentChanged()
-    })
+    })    
 
     this.compileTabLogic.event.on('startingCompilation', this.data.eventHandlers.onStartingCompilation)
     this.compileTabLogic.event.on('removeAnnotations', this.data.eventHandlers.onRemoveAnnotations)