diff --git a/web/src/index.js b/web/src/index.js
index 6307a09..78105b8 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -41,7 +41,13 @@ const supportedThemes = ["light", "dark", "black"]
 
 const defaultState = {
 	packs: [],
+	loading: true,
+	error: null,
+}
+
+const defaultSearchState = {
 	searchTerm: null,
+	filteredPacks: null
 }
 
 class App extends Component {
@@ -50,8 +56,7 @@ class App extends Component {
 		this.defaultTheme = params.get("theme")
 		this.state = {
 			...defaultState,
-			loading: true,
-			error: null,
+			...defaultSearchState,
 			stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"),
 			theme: localStorage.mauStickerThemeOverride || this.defaultTheme,
 			frequentlyUsed: {
@@ -101,31 +106,24 @@ class App extends Component {
 	// Search
 
 	resetSearch() {
-		this.setState({ searchTerm: defaultState.searchTerm })
+		this.setState({ ...defaultSearchState })
 	}
 
-	searchStickers(e) {
-		if (e.key === "Escape") {
-			this.resetSearch()
-			return
-		}
-
+	searchStickers(searchTerm) {
 		const sanitizeString = s => s.toLowerCase().trim()
-		const searchTerm = sanitizeString(e.target.value)
+		const sanitizedSearch = sanitizeString(searchTerm)
 
 		const allPacks = [this.state.frequentlyUsed, ...this.state.packs]
 		const packsWithFilteredStickers = allPacks.map(pack => ({
 			...pack,
 			stickers: pack.stickers.filter(sticker =>
-				sanitizeString(sticker.body).includes(searchTerm) ||
-				sanitizeString(sticker.id).includes(searchTerm)
+				sanitizeString(sticker.body).includes(sanitizedSearch) ||
+				sanitizeString(sticker.id).includes(sanitizedSearch)
 			),
 		}))
+		const filteredPacks = packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length)
 
-		this.setState({
-			filteredPacks: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length),
-			searchTerm,
-		})
+		this.setState({ searchTerm, filteredPacks })
 	}
 
 	// End search
@@ -284,8 +282,10 @@ class App extends Component {
 
 	render() {
 		const theme = `theme-${this.state.theme}`
-		const filterActive = !!this.state.searchTerm
+
+		const filterActive = !!this.state.filteredPacks
 		const packs = filterActive ? this.state.filteredPacks : [this.state.frequentlyUsed, ...this.state.packs]
+		const noPacksForSearch = filterActive && packs.length === 0
 
 		if (this.state.loading) {
 			return html`<main class="spinner ${theme}"><${Spinner} size=${80} green /></main>`
@@ -304,9 +304,13 @@ class App extends Component {
 				${this.state.packs.map(pack => html`<${NavBarItem} id=${pack.id} pack=${pack}/>`)}
 				<${NavBarItem} pack=${{ id: "settings", title: "Settings" }} iconOverride="settings" />
 			</nav>
-			<${SearchBox} onKeyUp=${this.searchStickers} resetSearch=${this.resetSearch} value=${this.state.searchTerm} />
+			<${SearchBox}
+				value=${this.state.searchTerm}
+				onSearch=${this.searchStickers}
+				onReset=${this.resetSearch}
+			/>
 			<div class="pack-list ${isMobileSafari ? "ios-safari-hack" : ""}" ref=${elem => this.packListRef = elem}>
-				${filterActive && packs.length === 0 ? html`<div class="search-empty"><h1>No stickers match your search</h1></div>` : null}
+				${noPacksForSearch ? html`<div class="search-empty"><h1>No stickers match your search</h1></div>` : null}
 				${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)}
 				<${Settings} app=${this}/>
 			</div>
diff --git a/web/src/search-box.js b/web/src/search-box.js
index 13ae3cf..3360d6a 100644
--- a/web/src/search-box.js
+++ b/web/src/search-box.js
@@ -13,27 +13,71 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-import { html } from "../lib/htm/preact.js"
+import { html, Component } from "../lib/htm/preact.js"
 
 export function shouldAutofocusSearchBar() {
   return localStorage.mauAutofocusSearchBar === 'true'
 }
 
-export const SearchBox = ({ onKeyUp, resetSearch, value }) => {
-	const autofocus = shouldAutofocusSearchBar()
+const SEARCHBOX_CLASSNAME = 'search-box'
 
-	const className = `icon-display ${value ? 'reset-click-zone' : null}`
-	const title = value ? 'Click to reset' : null
-	const onClick = value ? resetSearch : null
+export class SearchBox extends Component {
+	constructor(props) {
+		super(props)
 
-	const iconToDisplay = `icon-${!value ? 'search' : 'reset'}`
+		this.autofocus = shouldAutofocusSearchBar()
+		this.value = props.value
+		this.onSearch = props.onSearch
+		this.onReset = props.onReset
 
-	return html`
-		<div class="search-box">
-			<input value=${value} placeholder="Find stickers" onKeyUp=${onKeyUp} autoFocus=${autofocus} />
-			<div class=${className} title=${title} onClick=${onClick}>
-				<span class="icon ${iconToDisplay}" />
+		this.search = this.search.bind(this)
+		this.clearSearch = this.clearSearch.bind(this)
+	}
+
+	componentDidMount() {
+		// required for firefox / webview usage in mobile clients
+		const inputInWebView = document.querySelector(`.${SEARCHBOX_CLASSNAME} input`)
+		if (inputInWebView && this.autofocus) {
+			inputInWebView.focus()
+		}
+	}
+
+	componentWillReceiveProps(props) {
+		this.value = props.value
+	}
+
+	search(e) {
+		if (e.key === "Escape") {
+			this.clearSearch()
+			return
+		}
+		this.onSearch(e.target.value)
+	}
+
+	clearSearch() {
+		this.onReset()
+	}
+
+	render() {
+		const isEmpty = !this.value
+
+		const className = `icon-display ${isEmpty ? null : 'reset-click-zone'}`
+		const title = isEmpty ? null : 'Click to reset'
+		const onClick = isEmpty ? null : this.clearSearch
+		const iconToDisplay = `icon-${isEmpty ? 'search' : 'reset'}`
+
+		return html`
+			<div class=${SEARCHBOX_CLASSNAME}>
+				<input
+					placeholder="Find stickers …"
+					value=${this.value}
+					onKeyUp=${this.search}
+					autoFocus=${this.autofocus}
+				/>
+				<div class=${className} title=${title} onClick=${onClick}>
+					<span class="icon ${iconToDisplay}" />
+				</div>
 			</div>
-		</div>
-	`
+		`
+	}
 }
diff --git a/web/style/index.css b/web/style/index.css
index 2cc06bd..726ecdb 100644
--- a/web/style/index.css
+++ b/web/style/index.css
@@ -1 +1 @@
-*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) min-content auto}main.theme-light{--highlight-color: #eee;--search-box-color: var(--highlight-color);--text-color: black;background-color:#fff}main.theme-dark{--highlight-color: #444;--search-box-color: #383e4b;--text-color: white;background-color:#22262e}main.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon-search{--icon-image: url(../res/search.svg)}.icon.icon-reset{--icon-image: url(../res/reset.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * 0.7rem + 2 * 0.5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.search-box{display:flex;margin:.5rem;border-radius:.4rem;overflow:hidden}div.search-box input,div.search-box .icon-display{color:var(--text-color);opacity:.5;transition:opacity .1s;background-color:var(--search-box-color)}div.search-box input:focus,div.search-box input:focus+.icon-display,div.search-box .icon-display:focus,div.search-box .icon-display:focus+.icon-display{opacity:1}div.search-box .icon-display{padding:.7rem;width:1rem;height:1rem}div.search-box .icon-display.reset-click-zone{cursor:pointer}div.search-box .icon-display .icon{display:block;width:1rem;height:1rem}div.search-box input{flex-grow:1;outline:none;border:none;margin:0;padding:.7rem;padding-right:0;height:1rem;font-size:1rem}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input:not([type=checkbox]){width:100%}
+*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) min-content auto}main.theme-light{--highlight-color: #eee;--search-box-color: var(--highlight-color);--text-color: black;background-color:#fff}main.theme-dark{--highlight-color: #444;--search-box-color: #383e4b;--text-color: white;background-color:#22262e}main.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon-search{--icon-image: url(../res/search.svg)}.icon.icon-reset{--icon-image: url(../res/reset.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * 0.7rem + 2 * 0.5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.search-box{display:flex;margin:.5rem;padding:0;border-radius:.4rem;background-color:var(--search-box-color);opacity:.5;transition:all .1s;border:1px solid transparent}div.search-box:focus-within{opacity:1;border:1px solid var(--text-color)}div.search-box:not(:focus-within):hover{opacity:.7}div.search-box input,div.search-box .icon-display{color:var(--text-color);outline:none;border:none;height:1rem;margin:0;padding:.7rem;background-color:transparent;-webkit-tap-highlight-color:transparent}div.search-box .icon-display{width:1rem}div.search-box .icon-display.reset-click-zone{cursor:pointer}div.search-box .icon-display .icon{display:block;width:1rem;height:1rem}div.search-box input{flex-grow:1;font-size:1rem}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input:not([type=checkbox]){width:100%}
diff --git a/web/style/index.sass b/web/style/index.sass
index f760994..1cdb283 100644
--- a/web/style/index.sass
+++ b/web/style/index.sass
@@ -171,22 +171,32 @@ div.sticker
 div.search-box
   display: flex
   margin: $search-box-input-margin
+  padding: 0
   border-radius: .4rem
-  overflow: hidden
+  background-color: var(--search-box-color)
+  opacity: .5
+  transition: all .1s
+  border: 1px solid transparent
+
+  &:focus-within
+    opacity: 1
+    border: 1px solid var(--text-color)
+
+  &:not(:focus-within):hover
+    opacity: .7
 
   input,.icon-display
     color: var(--text-color)
-    opacity: .5
-    transition: opacity .1s
-    background-color: var(--search-box-color)
-
-    &:focus,&:focus+.icon-display
-      opacity: 1
+    outline: none
+    border: none
+    height: $search-box-input-height
+    margin: 0
+    padding: $search-box-input-padding
+    background-color: transparent
+    -webkit-tap-highlight-color: transparent
 
   .icon-display
-    padding: $search-box-input-padding
     width: $search-box-input-height
-    height: $search-box-input-height
 
     &.reset-click-zone
       cursor: pointer
@@ -198,12 +208,6 @@ div.search-box
 
   input
     flex-grow: 1
-    outline: none
-    border: none
-    margin: 0
-    padding: $search-box-input-padding
-    padding-right: 0
-    height: $search-box-input-height
     font-size: 1rem
 
 div.settings-list