diff --git a/src/app.js b/src/app.js
index 59b1f9590c..cc1282ca69 100644
--- a/src/app.js
+++ b/src/app.js
@@ -531,6 +531,10 @@ function run () {
       udapp: udapp.event
     }})
 
+  self._components.editorpanel.terminal().event.register('listenOnNetWork', (listenOnNetWork) => {
+    txlistener.setListenOnNetwork(listenOnNetWork)
+  })
+
   var eventsDecoder = new EventsDecoder({
     api: {
       resolveReceipt: function (tx, cb) {
diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index c5bd6096c2..9b423fc1cf 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -231,6 +231,9 @@ class EditorPanel {
     var self = this
     return self._components.terminal.registerCommand(name, command)
   }
+  terminal () {
+    return this._components.terminal
+  }
   _renderTabsbar () {
     var self = this
     if (self._view.tabsbar) return self._view.tabsbar
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 632a10de5b..8cb7d71f0f 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -214,10 +214,15 @@ class Terminal {
           </div>
           ${self._view.dropdown}
           <input type="text" class=${css.filter} onkeyup=${filter}></div>
+          <input onchange=${listenOnNetwork} type="checkbox" /><label title="Remix will listen on all transactions mined in the current environment and not only transactions created from the GUI">Listen on network</label>
           ${self._view.icon}
         </div>
       </div>
     `
+    function listenOnNetwork (ev) {
+      self.event.trigger('listenOnNetWork', [ev.currentTarget.checked])
+    }
+
     self._view.term = yo`
       <div class=${css.terminal} onscroll=${throttle(reattach, 10)} onclick=${focusinput}>
         ${self._view.journal}