diff --git a/apps/remixdesktop/test/tests/app/compiler.test.ts b/apps/remixdesktop/test/tests/app/compiler.test.ts
index 7da49f2685..2fce46320c 100644
--- a/apps/remixdesktop/test/tests/app/compiler.test.ts
+++ b/apps/remixdesktop/test/tests/app/compiler.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'download compiler': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/externaleditor.test.ts b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
index 75d074bb00..89e991fdcd 100644
--- a/apps/remixdesktop/test/tests/app/externaleditor.test.ts
+++ b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
@@ -2,7 +2,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const testsBash = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts
index a0457f6ee9..3aa370882a 100644
--- a/apps/remixdesktop/test/tests/app/foundry.test.ts
+++ b/apps/remixdesktop/test/tests/app/foundry.test.ts
@@ -9,7 +9,6 @@ const dir = '/tmp/' + projectDir
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     installFoundry: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/gist.test.ts b/apps/remixdesktop/test/tests/app/gist.test.ts
index 443581eb0f..b53c741910 100644
--- a/apps/remixdesktop/test/tests/app/gist.test.ts
+++ b/apps/remixdesktop/test/tests/app/gist.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 const gist_id  = '02a847917a6a7ecaf4a7e0d4e68715bf'
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'start gist': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts
index ba954da076..813c31da44 100644
--- a/apps/remixdesktop/test/tests/app/git-ui.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
index cd1679a732..6a1f3b598b 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
index 83906f9285..6fb96951ff 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
index a82a0ad8b9..521462122d 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git.test.ts b/apps/remixdesktop/test/tests/app/git.test.ts
index a4f92f4bab..9cc26be3d0 100644
--- a/apps/remixdesktop/test/tests/app/git.test.ts
+++ b/apps/remixdesktop/test/tests/app/git.test.ts
@@ -4,7 +4,6 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
   '@isogit': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   'clone a repo': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/github.test.ts b/apps/remixdesktop/test/tests/app/github.test.ts
index 7e3f83265a..612be7e02f 100644
--- a/apps/remixdesktop/test/tests/app/github.test.ts
+++ b/apps/remixdesktop/test/tests/app/github.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_2.test.ts b/apps/remixdesktop/test/tests/app/github_2.test.ts
index 55f011dee2..3b02b3746c 100644
--- a/apps/remixdesktop/test/tests/app/github_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_2.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_3.test.ts b/apps/remixdesktop/test/tests/app/github_3.test.ts
index 3bcc366964..12542bb86f 100644
--- a/apps/remixdesktop/test/tests/app/github_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_3.test.ts
@@ -5,7 +5,7 @@ let commitCount = 0
 let branchCount = 0
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/hardhat.test.ts b/apps/remixdesktop/test/tests/app/hardhat.test.ts
index a9ca651595..f8c093102e 100644
--- a/apps/remixdesktop/test/tests/app/hardhat.test.ts
+++ b/apps/remixdesktop/test/tests/app/hardhat.test.ts
@@ -8,7 +8,6 @@ const dir = path.join('remix-desktop-test-' + Date.now().toString())
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     setuphardhat: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/offline.test.ts b/apps/remixdesktop/test/tests/app/offline.test.ts
index 48f308b7eb..284d44991a 100644
--- a/apps/remixdesktop/test/tests/app/offline.test.ts
+++ b/apps/remixdesktop/test/tests/app/offline.test.ts
@@ -4,7 +4,6 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
     '@offline': true,
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/search.test.ts b/apps/remixdesktop/test/tests/app/search.test.ts
index 7b5824d800..8f3ba0a9e7 100644
--- a/apps/remixdesktop/test/tests/app/search.test.ts
+++ b/apps/remixdesktop/test/tests/app/search.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
index 8af6d2ea6d..21b3f38ea5 100644
--- a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
+++ b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
@@ -3,7 +3,6 @@ import { ChildProcess, spawn, execSync } from 'child_process'
 import { homedir } from 'os'
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/templates.test.ts b/apps/remixdesktop/test/tests/app/templates.test.ts
index 78d36507e9..86528458e9 100644
--- a/apps/remixdesktop/test/tests/app/templates.test.ts
+++ b/apps/remixdesktop/test/tests/app/templates.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xterm.test.ts b/apps/remixdesktop/test/tests/app/xterm.test.ts
index c7c32c0303..df238fbcc9 100644
--- a/apps/remixdesktop/test/tests/app/xterm.test.ts
+++ b/apps/remixdesktop/test/tests/app/xterm.test.ts
@@ -5,7 +5,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xtermwin.test.ts b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
index f714d736cf..cf7b1e5be4 100644
--- a/apps/remixdesktop/test/tests/app/xtermwin.test.ts
+++ b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
@@ -2,7 +2,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index f3738ee5b8..f3c0bf43d0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -13,6 +13,7 @@ import { IntlProvider } from 'react-intl'
 import { UsageTypes } from './types'
 import { appReducer } from './reducer/app'
 import { appInitialState } from './state/app'
+import isElectron from 'is-electron'
 
 declare global {
   interface Window {
@@ -45,7 +46,7 @@ const RemixApp = (props: IRemixAppUi) => {
 
   const [appState, appStateDispatch] = useReducer(appReducer, {
     ...appInitialState,
-    showPopupPanel: !window.localStorage.getItem('did_show_popup_panel')
+    showPopupPanel: !window.localStorage.getItem('did_show_popup_panel') && !isElectron()
   })
 
   useEffect(() => {