diff --git a/ts/components/emoji/EmojiButton.tsx b/ts/components/emoji/EmojiButton.tsx index 2168fe32753..84ecb3d046f 100644 --- a/ts/components/emoji/EmojiButton.tsx +++ b/ts/components/emoji/EmojiButton.tsx @@ -88,6 +88,12 @@ export const EmojiButton = React.memo( const { ctrlKey, key, metaKey, shiftKey } = event; const ctrlOrCommand = metaKey || ctrlKey; + // We don't want to open up if the conversation has any panels open + const panels = document.querySelectorAll('.conversation .panel'); + if (panels && panels.length > 1) { + return; + } + if (ctrlOrCommand && shiftKey && (key === 'e' || key === 'E')) { event.stopPropagation(); event.preventDefault(); diff --git a/ts/components/stickers/StickerButton.tsx b/ts/components/stickers/StickerButton.tsx index 86df143ada5..944752a0f1a 100644 --- a/ts/components/stickers/StickerButton.tsx +++ b/ts/components/stickers/StickerButton.tsx @@ -154,6 +154,12 @@ export const StickerButton = React.memo( const { ctrlKey, key, metaKey, shiftKey } = event; const ctrlOrCommand = metaKey || ctrlKey; + // We don't want to open up if the conversation has any panels open + const panels = document.querySelectorAll('.conversation .panel'); + if (panels && panels.length > 1) { + return; + } + if (ctrlOrCommand && shiftKey && (key === 's' || key === 'S')) { event.stopPropagation(); event.preventDefault();