diff --git a/src/components/right/RightColumn.tsx b/src/components/right/RightColumn.tsx
index c0e0e85db..ce66d7023 100644
--- a/src/components/right/RightColumn.tsx
+++ b/src/components/right/RightColumn.tsx
@@ -217,7 +217,7 @@ const RightColumn: FC<OwnProps & StateProps> = ({
     addChatMembers({ chatId: chatId!, memberIds });
   });
 
-  useEffect(() => (isOpen ? captureEscKeyListener(close) : undefined), [isOpen, close]);
+  useEffect(() => (isOpen && chatId ? captureEscKeyListener(close) : undefined), [isOpen, close, chatId]);
 
   useEffect(() => {
     setTimeout(() => {