diff --git a/webmail/webmail.js b/webmail/webmail.js
index 03981a2..09d0400 100644
--- a/webmail/webmail.js
+++ b/webmail/webmail.js
@@ -3993,7 +3993,7 @@ const init = async () => {
 				await selectLabel();
 			}));
 		}), labels.length === 0 ? dom.div('No labels yet, set one on a message first.') : []));
-	})), ' ', dom.clickbutton('x', style({ padding: '0 .25em' }), attr.arialabel('Clear refinement filters'), attr.title('Clear refinement filters.'), async function click(e) {
+	})), ' ', dom.clickbutton('x', style({ padding: '0 .25em' }), attr.arialabel('Clear refinement filters.'), attr.title('Clear refinement filters.'), async function click(e) {
 		settingsPut({ ...settings, refine: '' });
 		refineToggleActive(e.target);
 		await withStatus('Requesting messages', requestNewView(false));
@@ -4162,38 +4162,20 @@ const init = async () => {
 			ensureSearchView();
 		}
 		searchView.updateForm();
-	}), dom.clickbutton('x', attr.arialabel('Cancel and clear search.'), attr.title('Cancel and clear search.'), style({ marginLeft: '.25em', padding: '0 .3em' }), async function click() {
+	}), dom.clickbutton('x', attr.arialabel('Cancel and clear search and open Inbox.'), attr.title('Cancel and clear search and open Inbox.'), style({ marginLeft: '.25em', padding: '0 .3em' }), async function click() {
 		searchbarElem.value = '';
 		if (!search.active) {
 			return;
 		}
-		clearList();
-		unloadSearch();
-		updatePageTitle();
-		setLocationHash();
-		if (requestID) {
-			requestSequence++;
-			requestID = requestSequence;
-			const query = {
-				OrderAsc: settings.orderAsc,
-				Filter: newFilter(),
-				NotFilter: newNotFilter()
-			};
-			const page = { AnchorMessageID: 0, Count: 0, DestMessageID: 0 };
-			const request = {
-				ID: requestID,
-				SSEID: sseID,
-				ViewID: viewID,
-				Cancel: true,
-				Query: query,
-				Page: page,
-			};
-			dom._kids(queryactivityElem);
-			await withStatus('Canceling query', client.Request(request));
-		}
-		else {
-			dom._kids(queryactivityElem);
+		const mb = mailboxlistView.findMailboxByName('Inbox');
+		if (!mb) {
+			window.alert('Cannot find inbox.');
+			return;
 		}
+		await mailboxlistView.openMailboxID(mb.ID, true);
+		const f = newFilter();
+		f.MailboxID = mb.ID;
+		await withStatus('Requesting messages', requestNewView(true, f, newNotFilter()));
 	}), async function submit(e) {
 		e.preventDefault();
 		await searchView.submit();
diff --git a/webmail/webmail.ts b/webmail/webmail.ts
index e9c09ec..290fd5f 100644
--- a/webmail/webmail.ts
+++ b/webmail/webmail.ts
@@ -4098,7 +4098,7 @@ const init = async () => {
 				dom.clickbutton(
 					'x',
 					style({padding: '0 .25em'}),
-					attr.arialabel('Clear refinement filters'),
+					attr.arialabel('Clear refinement filters.'),
 					attr.title('Clear refinement filters.'),
 					async function click(e: MouseEvent) {
 						settingsPut({...settings, refine: ''})
@@ -4349,38 +4349,27 @@ const init = async () => {
 								searchView.updateForm()
 							},
 						),
-						dom.clickbutton('x', attr.arialabel('Cancel and clear search.'), attr.title('Cancel and clear search.'), style({marginLeft: '.25em', padding: '0 .3em'}), async function click() {
-							searchbarElem.value = ''
-							if (!search.active) {
-								return
-							}
-							clearList()
-							unloadSearch()
-							updatePageTitle()
-							setLocationHash()
-							if (requestID) {
-								requestSequence++
-								requestID = requestSequence
-								const query = {
-									OrderAsc: settings.orderAsc,
-									Filter: newFilter(),
-									NotFilter: newNotFilter()
+						dom.clickbutton('x',
+							attr.arialabel('Cancel and clear search and open Inbox.'),
+							attr.title('Cancel and clear search and open Inbox.'),
+							style({marginLeft: '.25em', padding: '0 .3em'}),
+							async function click() {
+								searchbarElem.value = ''
+								if (!search.active) {
+									return
 								}
-								const page = {AnchorMessageID: 0, Count: 0, DestMessageID: 0}
-								const request = {
-									ID: requestID,
-									SSEID: sseID,
-									ViewID: viewID,
-									Cancel: true,
-									Query: query,
-									Page: page,
+
+								const mb = mailboxlistView.findMailboxByName('Inbox')
+								if (!mb) {
+									window.alert('Cannot find inbox.')
+									return
 								}
-								dom._kids(queryactivityElem)
-								await withStatus('Canceling query', client.Request(request))
-							} else {
-								dom._kids(queryactivityElem)
-							}
-						}),
+								await mailboxlistView.openMailboxID(mb.ID, true)
+								const f = newFilter()
+								f.MailboxID = mb.ID
+								await withStatus('Requesting messages', requestNewView(true, f, newNotFilter()))
+							},
+						),
 						async function submit(e: SubmitEvent) {
 							e.preventDefault()
 							await searchView.submit()