diff --git a/fluxer_app/src/features/channel/components/ChannelHeader.module.css b/fluxer_app/src/features/channel/components/ChannelHeader.module.css
index 925cffbe7..aaa935e56 100644
--- a/fluxer_app/src/features/channel/components/ChannelHeader.module.css
+++ b/fluxer_app/src/features/channel/components/ChannelHeader.module.css
@@ -502,7 +502,8 @@
 }
 
 .headerContainerThreadPanelOpen {
-	grid-template-columns: minmax(min(12rem, 40%), 1fr) minmax(0, auto);
+	container-type: inline-size;
+	grid-template-columns: minmax(0, max-content) minmax(min-content, 1fr);
 }
 
 .headerContainerThreadPanelOpen .topicDivider,
@@ -512,6 +513,7 @@
 
 .headerContainerThreadPanelOpen .messageSearchFocusWrapper {
 	flex: 0 1 15.25rem;
+	width: 9rem;
 	min-width: 9rem;
 }
 
@@ -520,6 +522,13 @@
 	min-width: 0;
 }
 
+@container (max-width: 32rem) {
+	.headerContainerThreadPanelOpen .messageSearchFocusWrapper {
+		width: var(--channel-header-action-size);
+		min-width: var(--channel-header-action-size);
+	}
+}
+
 .iconButton {
 	display: flex;
 	align-items: center;