From f023a0799cfabf03a6603eee4560a086abad96dd Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 22 Feb 2023 15:06:59 +0100
Subject: [PATCH] Probable fix for #860

---
 dev/Stores/User/App.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js
index 9a09b0b42..ad8848aef 100644
--- a/dev/Stores/User/App.js
+++ b/dev/Stores/User/App.js
@@ -1,6 +1,7 @@
 import { keyScope, leftPanelDisabled, SettingsGet, elementById } from 'Common/Globals';
 import { addObservablesTo } from 'External/ko';
 import { ThemeStore } from 'Stores/Theme';
+import { arePopupsVisible } from 'Knoin/Knoin';
 
 export const AppUserStore = {
 	allowContacts: () => !!SettingsGet('contactsAllowed')
@@ -15,7 +16,7 @@ addObservablesTo(AppUserStore, {
 AppUserStore.focusedState.subscribe(value => {
 	['FolderList','MessageList','MessageView'].forEach(name => {
 		if (name === value) {
-			keyScope(value);
+			arePopupsVisible() || keyScope(value);
 			ThemeStore.isMobile() && leftPanelDisabled('FolderList' !== value);
 		}
 		let dom = elementById('V-Mail'+name);