diff --git a/src/actions/ImportAccountActions.js b/src/actions/ImportAccountActions.js
index ff6c24fe..4e9d205f 100644
--- a/src/actions/ImportAccountActions.js
+++ b/src/actions/ImportAccountActions.js
@@ -34,11 +34,7 @@ export const importAddress = (
 
     let payload;
     const index = getState().accounts.filter(
-        a =>
-            a.imported === true &&
-            a.network === network.shortcut &&
-            device &&
-            a.deviceState === device.state
+        a => a.imported === true && a.network === network.shortcut
     ).length;
 
     try {
diff --git a/src/reducers/AccountsReducer.js b/src/reducers/AccountsReducer.js
index 3fe36f19..84008112 100644
--- a/src/reducers/AccountsReducer.js
+++ b/src/reducers/AccountsReducer.js
@@ -48,7 +48,12 @@ export const findAccount = (
     deviceState: string,
     network: string
 ): ?Account =>
-    state.find(a => a.deviceState === deviceState && a.index === index && a.network === network);
+    state.find(
+        a =>
+            (a.deviceState === deviceState || a.imported) &&
+            a.index === index &&
+            a.network === network
+    );
 
 export const findDeviceAccounts = (
     state: State,
@@ -56,9 +61,11 @@ export const findDeviceAccounts = (
     network: string
 ): Array<Account> => {
     if (network) {
-        return state.filter(addr => addr.deviceState === device.state && addr.network === network);
+        return state.filter(
+            addr => (addr.deviceState === device.state || addr.imported) && addr.network === network
+        );
     }
-    return state.filter(addr => addr.deviceState === device.state);
+    return state.filter(addr => addr.deviceState === device.state || addr.imported);
 };
 
 const createAccount = (state: State, account: Account): State => {
diff --git a/src/reducers/utils/index.js b/src/reducers/utils/index.js
index 41422f4c..13b74967 100644
--- a/src/reducers/utils/index.js
+++ b/src/reducers/utils/index.js
@@ -92,7 +92,7 @@ export const getSelectedAccount = (state: State): ?Account => {
     return state.accounts.find(
         a =>
             a.imported === isImported &&
-            a.deviceState === device.state &&
+            (a.deviceState === device.state || a.imported) &&
             a.index === index &&
             a.network === locationState.network
     );