diff --git a/src/app/components/panel.js b/src/app/components/panel.js
index abee8c03e7..0df5a4184c 100644
--- a/src/app/components/panel.js
+++ b/src/app/components/panel.js
@@ -58,6 +58,7 @@ export class AbstractPanel {
       if (!this.contents[name]) return
       if (this.active === name) {
         this.events.emit('toggle', name)
+        return
       }
       this.showContent(name)
       this.events.emit('showing', name)
diff --git a/test-browser/tests/generalTests.js b/test-browser/tests/generalTests.js
index e820a54e3b..af41be8f5f 100644
--- a/test-browser/tests/generalTests.js
+++ b/test-browser/tests/generalTests.js
@@ -164,7 +164,7 @@ function checkDeployShouldSucceed (browser, address, callback) {
 
 function testSignature (browser, callback) {
   let hash, signature
-  browser.clickLaunchIcon('run').pause(4000).perform((client, done) => {
+  browser.perform((client, done) => {
     contractHelper.signMsg(browser, 'test message', (h, s) => {
       hash = h
       signature = s