diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index b65c431b8bb..fe87312dc48 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -1066,6 +1066,7 @@ export default {
 	&__input {
 		flex-grow: 1;
 		position: relative;
+		min-width: 0;
 	}
 
 	// Override NcRichContenteditable styles
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 294546892a4..ae133a3d84f 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -56,15 +56,16 @@ components.
 				<p dir="auto">{{ shortenedQuoteMessage }}</p>
 			</blockquote>
 		</div>
-		<div v-if="canCancel" class="quote__main__right">
-			<NcButton type="tertiary"
-				:aria-label="cancelQuoteLabel"
-				@click="handleAbort">
-				<template #icon>
-					<Close :size="20" />
-				</template>
-			</NcButton>
-		</div>
+
+		<NcButton v-if="canCancel"
+			class="quote__close"
+			type="tertiary"
+			:aria-label="cancelQuoteLabel"
+			@click="handleAbort">
+			<template #icon>
+				<Close :size="20" />
+			</template>
+		</NcButton>
 	</a>
 </template>
 
@@ -297,6 +298,7 @@ export default {
 	border-radius: var(--border-radius-large);
 	border: 2px solid var(--color-border);
 	background-color: var(--color-main-background);
+	overflow: hidden;
 
 	&::before {
 		content: ' ';
@@ -343,13 +345,11 @@ export default {
 			gap: 4px;
 		}
 	}
-	&__right {
-		flex: 0 0 44px;
-		color: var(--color-text-maxcontrast);
-		font-size: 13px;
-		padding: 0 8px 0 8px;
-		position: relative;
-		margin: auto;
+
+	&__close {
+		position: absolute !important;
+		top: 4px;
+		right: 4px;
 	}
 }