diff --git a/src/app/tabs/runTab/contractDropdown.js b/src/app/tabs/runTab/contractDropdown.js
index c8a6844b63..5135854478 100644
--- a/src/app/tabs/runTab/contractDropdown.js
+++ b/src/app/tabs/runTab/contractDropdown.js
@@ -71,7 +71,7 @@ class ContractDropdownUI {
   setCheckedState (value) {
     value = value === 'true' ? true : value === 'false' ? false : value
     this.ipfsCheckedState = value
-    document.getElementById('deployAndRunPublishToIPFS').checked = value
+    if (this.ipfsCheckbox) this.ipfsCheckbox.checked = value
   }
 
   toggleCheckedState () {
@@ -92,13 +92,13 @@ class ContractDropdownUI {
     const savedConfig = window.localStorage.getItem(`ipfs/${this.exEnvironment}/${this.networkName}`)
     this.ipfsCheckedState = savedConfig === 'true' ? true : false // eslint-disable-line
 
-    const ipfsCheckbox = this.ipfsCheckedState === true
-    ? yo`<input id="deployAndRunPublishToIPFS" class="mr-2" checked type="checkbox" onchange=${this.toggleCheckedState.bind(this)} >`
-    : yo`<input id="deployAndRunPublishToIPFS" class="mr-2" type="checkbox" onchange=${this.toggleCheckedState.bind(this)} >`
+    this.ipfsCheckbox = this.ipfsCheckedState === true
+    ? yo`<input id="deployAndRunPublishToIPFS" data-id="contractDropdownIpfsCheckbox" class="mr-2" checked type="checkbox" onchange=${this.toggleCheckedState.bind(this)} >`
+    : yo`<input id="deployAndRunPublishToIPFS" data-id="contractDropdownIpfsCheckbox" class="mr-2" type="checkbox" onchange=${this.toggleCheckedState.bind(this)} >`
 
     this.deployCheckBox = yo`
       <div class="mt-2 d-flex align-items-start">
-        ${ipfsCheckbox}
+        ${this.ipfsCheckbox}
         <label
           for="deployAndRunPublishToIPFS"
           class="p-0 m-0"
diff --git a/test-browser/tests/publishContract.js b/test-browser/tests/publishContract.js
index 82b32acc64..f5fa6242cf 100644
--- a/test-browser/tests/publishContract.js
+++ b/test-browser/tests/publishContract.js
@@ -22,7 +22,6 @@ module.exports = {
       done()
     })
     .modalFooterOKClick()
-    .end()
   },
   'Publish on Swarm': '' + function (browser) {
     browser
@@ -32,6 +31,28 @@ module.exports = {
       if (value.indexOf('bzz') === -1) browser.assert.fail('swarm deploy failed', '', '')
       done()
     })
+    .modalFooterOKClick()
+  },
+  'Should publish contract metadata to ipfs on deploy': function (browser) {
+    browser
+    .waitForElementVisible('#icon-panel')
+    .clickLaunchIcon('fileExplorers')
+    .switchFile('browser/1_Storage.sol')
+    .clickLaunchIcon('udapp')
+    .waitForElementVisible('*[data-id="contractDropdownIpfsCheckbox"]')
+    .click('*[data-id="contractDropdownIpfsCheckbox"]')
+    .click('*[data-id="Deploy - transact (not payable)"]')
+    .pause(5000)
+    .assert.containsText('*[data-id="modalDialogModalBody"]', 'Metadata of "storage" was published successfully.')
+    .modalFooterOKClick()
+  },
+  'Should remember choice after page refresh': function (browser) {
+    browser
+    .refresh()
+    .switchFile('browser/1_Storage.sol')
+    .clickLaunchIcon('udapp')
+    .waitForElementVisible('*[data-id="contractDropdownIpfsCheckbox"]')
+    .verify.elementPresent('*[data-id="contractDropdownIpfsCheckbox"]:checked')
     .end()
   },
   tearDown: sauce