diff --git a/test-e2e/password-lock-check.spec.js b/test-e2e/password-lock-check.spec.js
new file mode 100644
index 00000000..912a4b27
--- /dev/null
+++ b/test-e2e/password-lock-check.spec.js
@@ -0,0 +1,93 @@
+import { Application } from 'spectron'
+import { waitForDisappear, waitForExpectedText } from './helpers'
+
+const os = require('os')
+const path = require('path')
+const fs = require('fs')
+const appVersion = require('../package.json')
+
+let app
+
+const TIMEOUT = 50 * 1000
+
+let appPath
+let configPath
+const platform = os.platform()
+if (platform === 'darwin') {
+  appPath = `./dist/mac/Ledger Live.app/Contents/MacOS/Ledger Live`
+  configPath = `${os.homedir()}/Library/Application Support/Ledger Live/`
+} else if (platform === 'win32') {
+  appPath = `.\\dist\\win-unpacked\\Ledger Live.exe`
+  configPath = '%AppData\\Roaming\\Ledger Live'
+} else {
+  appPath = `./dist/ledger-live-desktop-${appVersion.version}-linux-x86_64.AppImage`
+  configPath = '$HOME/apps/ledger-live-desktop-$ledgerLiveVersion-linux-x86_64.AppImage'
+}
+
+describe('Application launch', () => {
+  beforeEach(async () => {
+    app = new Application({
+      path: appPath,
+      env: {
+        SKIP_ONBOARDING: '1',
+      },
+    })
+    await app.start()
+  }, TIMEOUT)
+
+  afterEach(async () => {
+    if (app && app.isRunning()) {
+      await app.stop()
+    }
+  }, TIMEOUT)
+
+  test(
+    'Start app, activate password lock, check app.json, deactivate password lock',
+    async () => {
+      const title = await app.client.getTitle()
+      expect(title).toEqual('Ledger Live')
+      await app.client.waitUntilWindowLoaded()
+      await waitForDisappear(app, '#preload')
+      // Verify Account summary text
+      // Count user's accounts
+      const userAccountsList = await app.client.elements('[data-e2e=dashboard_AccountCardWrapper]')
+      const userAccountsCount = Object.keys(userAccountsList.value).length
+      // Check account number
+      const accountSummary = await app.client.getText('[data-e2e=dashboard_accountsSummaryDesc]')
+      const accountSummaryMessage = `Here's the summary of your ${userAccountsCount} accounts`
+      expect(accountSummary).toEqual(accountSummaryMessage)
+
+      // Go to settings
+      await app.client.click('[data-e2e=setting_button]')
+      await waitForExpectedText(app, '[data-e2e=settings_title]', 'Settings')
+
+      // Enable lock password
+      await app.client.click('[data-e2e=passwordLock_button]')
+      await waitForExpectedText(app, '[data-e2e=setPassword_modalTitle]', 'Set a password')
+      await app.client.setValue('[data-e2e=setPassword_NewPassword]', 5)
+      await app.client.setValue('[data-e2e=setPassword_ConfirmPassword]', 5)
+      await app.client.keys('Enter')
+      await waitForExpectedText(app, '[data-e2e=settings_title]', 'Settings')
+      await app.client.pause(2000)
+      // Verify in app.json that accounts data are encrypted
+      const tmpAppJSONPath = path.resolve(configPath, 'app.json')
+      const LockedfileContent = fs.readFileSync(tmpAppJSONPath, 'utf-8')
+      const accountsOperations = '"operations":[{'
+      await expect(LockedfileContent).not.toContain(accountsOperations)
+
+      // Disable password lock
+      await app.client.click('[data-e2e=passwordLock_button]')
+      await waitForExpectedText(app, '[data-e2e=modal_title]', 'Disable password lock')
+      await app.client.setValue('#password', 5)
+      await app.client.pause(500)
+      await app.client.keys('Enter')
+      await waitForExpectedText(app, '[data-e2e=settings_title]', 'Settings')
+      await app.client.pause(3000)
+      const UnlockedfileContent = fs.readFileSync(tmpAppJSONPath, 'utf-8')
+      // Verify in app.json that accounts data are not encrypted
+      await expect(UnlockedfileContent).toContain(accountsOperations)
+      await app.client.pause(1000)
+    },
+    TIMEOUT,
+  )
+})