diff --git a/apps/remix-ide/src/app/compiler/compiler-artefacts.js b/apps/remix-ide/src/app/compiler/compiler-artefacts.js
index 631affde8e..e54de42977 100644
--- a/apps/remix-ide/src/app/compiler/compiler-artefacts.js
+++ b/apps/remix-ide/src/app/compiler/compiler-artefacts.js
@@ -15,6 +15,7 @@ module.exports = class CompilerArtefacts extends Plugin {
     super(profile)
     this.compilersArtefacts = {}
     this.compilersArtefactsPerFile = {}
+    this.addressToCompilationResults = {}
   }
 
   clear () {
diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js
index 25f3e3e546..367de3d943 100644
--- a/apps/remix-ide/src/app/panels/terminal.js
+++ b/apps/remix-ide/src/app/panels/terminal.js
@@ -478,8 +478,8 @@ class Terminal extends Plugin {
     self._components.txLogger.event.register('debuggingRequested', async (hash) => {
       // TODO should probably be in the run module
       if (!await self._opts.appManager.isActive('debugger')) await self._opts.appManager.activatePlugin('debugger')
-      this.call('debugger', 'debug', hash)
       this.call('menuicons', 'select', 'debugger')
+      this.call('debugger', 'debug', hash)
     })
 
     return self._view.el
diff --git a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
index 0e3918ed6a..6b27b1bbc7 100644
--- a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
+++ b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
@@ -26,11 +26,16 @@ class ContractDropdownUI {
 
   listenToEvents () {
     this.dropdownLogic.event.register('newlyCompiled', (success, data, source, compiler, compilerFullName, file) => {
+
       if (!this.selectContractNames) return
       this.selectContractNames.innerHTML = ''
       if (success) {
         this.dropdownLogic.getCompiledContracts(compiler, compilerFullName).forEach((contract) => {
+          console.log('file = ', file)
+          console.log('contrtact.file = ', contract.file)
           this.selectContractNames.appendChild(yo`<option value="${contract.name}" compiler="${compilerFullName}">${contract.name} - ${contract.file}</option>`)
+          this.runView.compilersArtefacts.addressToCompilationResults[contract.name + '-' + contract.file] = data
+          console.log("runView.compilersArtefacts.addressToCompilationResults ", this.runView.compilersArtefacts.addressToCompilationResults)
         })
       }
       this.enableAtAddress(success)
@@ -295,6 +300,9 @@ class ContractDropdownUI {
       }
 
       this.event.trigger('newContractInstanceAdded', [contractObject, address, contractObject.name])
+
+      this.runView.compilersArtefacts.addResolvedContract(address, this.runView.compilersArtefacts.addressToCompilationResults[contractObject.name + '-' + contractObject.file])
+      console.log("this.runView.compilersArtefacts.addressToCompilationResults[contractObject.name + '-' + contractObject.file]", this.runView.compilersArtefacts.addressToCompilationResults[contractObject.name + '-' + contractObject.file])
       if (this.ipfsCheckedState) {
         publishToStorage('ipfs', this.runView.fileProvider, this.runView.fileManager, selectedContract)
       }
diff --git a/apps/remix-ide/src/app/ui/txLogger.js b/apps/remix-ide/src/app/ui/txLogger.js
index 9546f7c110..9a945a805d 100644
--- a/apps/remix-ide/src/app/ui/txLogger.js
+++ b/apps/remix-ide/src/app/ui/txLogger.js
@@ -215,7 +215,14 @@ function renderKnownTransaction (self, data, blockchain) {
         ${checkTxStatus(data.receipt, txType)}
         ${context(self, { from, to, data }, blockchain)}
         <div class=${css.buttons}>
-          <button class="${css.debug} btn btn-primary btn-sm" data-shared="txLoggerDebugButton" data-id="txLoggerDebugButton${data.tx.hash}" onclick=${(e) => debug(e, data, self)}>Debug</div>
+          <button
+            class="${css.debug} btn btn-primary btn-sm"
+            data-shared="txLoggerDebugButton"
+            data-id="txLoggerDebugButton${data.tx.hash}"
+            onclick=${(e) => debug(e, data, self)}
+          >
+            Debug
+          </div>
         </div>
         <i class="${css.arrow} fas fa-angle-down"></i>
       </div>