diff --git a/electron.js b/electron.js
index ee942e4611..399f600dcf 100644
--- a/electron.js
+++ b/electron.js
@@ -3,7 +3,6 @@
 const { app, BrowserWindow, session, nativeTheme, ipcMain, powerMonitor, dialog } = require('electron');
 const { is, fixPathForAsarUnpack } = require('electron-util');
 const path = require('path');
-const os = require('os');
 const storage = require('electron-json-storage');
 const port = process.env.SERVER_PORT;
 const protocol = 'anytype';
@@ -95,12 +94,6 @@ nativeTheme.on('updated', () => {
 function createWindow () {
 	mainWindow = WindowManager.createMain({ route: Util.getRouteFromUrl(deeplinkingUrl), isChild: false });
 
-	if (process.env.ELECTRON_DEV_EXTENSIONS) {
-		BrowserWindow.addDevToolsExtension(
-			path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.6.0_0')
-		);
-	};
-
 	mainWindow.on('close', (e) => {
 		Util.log('info', 'closeMain: ' + app.isQuiting);
 
@@ -141,6 +134,8 @@ function createWindow () {
 			console.error('[Api] method not defined:', cmd);
 		};
 	});
+
+	
 };
 
 app.on('ready', () => {
@@ -194,9 +189,5 @@ app.on('activate', () => {
 
 app.on('open-url', (e, url) => {
 	e.preventDefault();
-
-	if (mainWindow) {
-		Util.send(mainWindow, 'route', Util.getRouteFromUrl(url));
-		mainWindow.show();
-	};
+	deeplinkingUrl = url;
 });
\ No newline at end of file
diff --git a/package.json b/package.json
index aca15942f3..b3776c283d 100644
--- a/package.json
+++ b/package.json
@@ -571,4 +571,4 @@
 			"pre-commit": "npm run precommit && git add licenses.json"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/ts/app.tsx b/src/ts/app.tsx
index 344cace28f..e630fd6eca 100644
--- a/src/ts/app.tsx
+++ b/src/ts/app.tsx
@@ -357,7 +357,7 @@ class App extends React.Component<object, State> {
 					return false;
 				});
 			} else {
-				commonStore.redirectSet(redirect || '');
+				commonStore.redirectSet(route || redirect || '');
 				Renderer.send('keytarGet', accountId);
 
 				cb();
diff --git a/src/ts/component/page/main/import.tsx b/src/ts/component/page/main/import.tsx
index 4e63704260..07486bf4f3 100644
--- a/src/ts/component/page/main/import.tsx
+++ b/src/ts/component/page/main/import.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Loader, Title, Error, Frame, Button } from 'Component';
-import { I, C, UtilCommon, UtilRouter, keyboard, translate } from 'Lib';
+import { I, C, UtilCommon, UtilRouter, UtilObject, keyboard, translate } from 'Lib';
 import { popupStore } from 'Store';
 
 interface State {
@@ -45,7 +45,7 @@ class PageMainImport extends React.Component<I.PageComponent, State> {
 			if (message.error.code) {
 				this.setState({ error: message.error.description });
 			} else {
-				keyboard.onBack();
+				UtilObject.openHome('route');
 				popupStore.open('usecase', { data: { object: message.info } });
 			};
 		});