diff --git a/src/pages/Stream/components/Querier/index.tsx b/src/pages/Stream/components/Querier/index.tsx
index f0b39565..5a4d001a 100644
--- a/src/pages/Stream/components/Querier/index.tsx
+++ b/src/pages/Stream/components/Querier/index.tsx
@@ -107,6 +107,20 @@ const QuerierModal = (props: {
 		}
 	}, [showQueryBuilder]);
 
+	useEffect(() => {
+		const handleKeyPress = (event: { key: string }) => {
+			if (event.key === 'Escape') {
+				onClose();
+			}
+		};
+
+		window.addEventListener('keydown', handleKeyPress);
+
+		return () => {
+			window.removeEventListener('keydown', handleKeyPress);
+		};
+	}, []);
+
 	return (
 		<Modal
 			opened={showQueryBuilder}