diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js
index c7edca9e1a..a06d92059f 100644
--- a/src/app/editor/editor.js
+++ b/src/app/editor/editor.js
@@ -31,7 +31,6 @@ function Editor (opts = {}) {
   ace.acequire('ace/ext/language_tools')
   editor.setOptions({
     enableBasicAutocompletion: true,
-    enableSnippets: true,
     enableLiveAutocompletion: true
   })
   var flowCompleter = {
diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index 99ddb0d6d3..daae7b8edd 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -202,9 +202,9 @@ function runTab (container, appAPI, appEvents, opts) {
     executionContext.executionContextChange(selectExEnv.options[selectExEnv.selectedIndex].value, null, () => {
       // set the final context. Cause it is possible that this is not the one we've originaly selected
       selectExEnv.value = executionContext.getProvider()
+      fillAccountsList(appAPI, el)
     })
 
-    fillAccountsList(appAPI, el)
     instanceContainer.innerHTML = '' // clear the instances list
     noInstancesText.style.display = 'block'
     instanceContainer.appendChild(noInstancesText)