diff --git a/src/shared/components/person/inbox.tsx b/src/shared/components/person/inbox.tsx
index 6500e961..294ba556 100644
--- a/src/shared/components/person/inbox.tsx
+++ b/src/shared/components/person/inbox.tsx
@@ -382,10 +382,10 @@ export class Inbox extends Component<any, InboxState> {
 
   selects() {
     return (
-      <div className="row g-2 mb-2">
-        <div className="col-auto">{this.unreadOrAllRadios()}</div>
-        <div className="col-auto">{this.messageTypeRadios()}</div>
-        <div className="col-auto">
+      <div className="row row-cols-auto g-2 mb-2">
+        <div className="col">{this.unreadOrAllRadios()}</div>
+        <div className="col">{this.messageTypeRadios()}</div>
+        <div className="col">
           <CommentSortSelect
             sort={this.state.sort}
             onChange={this.handleSortChange}
diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx
index c7a8cbaf..3774d0a1 100644
--- a/src/shared/components/search.tsx
+++ b/src/shared/components/search.tsx
@@ -546,8 +546,8 @@ export class Search extends Component<any, SearchState> {
 
     return (
       <>
-        <div className="row g-2 mb-2 mb-sm-3">
-          <div className="col-auto">
+        <div className="row row-cols-auto g-2 mb-2 mb-sm-3">
+          <div className="col">
             <select
               value={type}
               onChange={linkEvent(this, this.handleTypeChange)}
@@ -566,7 +566,7 @@ export class Search extends Component<any, SearchState> {
               ))}
             </select>
           </div>
-          <div className="col-auto">
+          <div className="col">
             <ListingTypeSelect
               type_={listingType}
               showLocal={showLocal(this.isoData)}
@@ -574,7 +574,7 @@ export class Search extends Component<any, SearchState> {
               onChange={this.handleListingTypeChange}
             />
           </div>
-          <div className="col-auto">
+          <div className="col">
             <SortSelect
               sort={sort}
               onChange={this.handleSortChange}