diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index f20c89c0aa..0d232f0599 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -63,6 +63,7 @@ import { isImageTypeSupported } from '../util/GoogleChrome';
 import * as KeyboardLayout from '../services/keyboardLayout';
 import { usePrevious } from '../hooks/usePrevious';
 import { PanelType } from '../types/Panels';
+import { useEscapeHandling } from '../hooks/useEscapeHandling';
 
 export type OwnProps = Readonly<{
   acceptedMessageRequest?: boolean;
@@ -517,6 +518,14 @@ export function CompositionArea({
     };
   }, [setLarge]);
 
+  const clearQuote = useCallback(() => {
+    if (quotedMessageId) {
+      setQuoteByMessageId(conversationId, undefined);
+    }
+  }, [conversationId, quotedMessageId, setQuoteByMessageId]);
+
+  useEscapeHandling(clearQuote);
+
   if (isSignalConversation) {
     // TODO DESKTOP-4547
     return <div />;
diff --git a/ts/components/conversation/TimelineItem.tsx b/ts/components/conversation/TimelineItem.tsx
index f6ce1852fc..a55f2cb0d3 100644
--- a/ts/components/conversation/TimelineItem.tsx
+++ b/ts/components/conversation/TimelineItem.tsx
@@ -217,6 +217,7 @@ export class TimelineItem extends React.PureComponent<PropsType> {
           {...reducedProps}
           {...item.data}
           isSelected={isSelected}
+          selectMessage={selectMessage}
           shouldCollapseAbove={shouldCollapseAbove}
           shouldCollapseBelow={shouldCollapseBelow}
           shouldHideMetadata={shouldHideMetadata}