diff --git a/webclient/src/App.js b/webclient/src/App.js
index d300c52..42116ad 100644
--- a/webclient/src/App.js
+++ b/webclient/src/App.js
@@ -274,8 +274,14 @@ function App() {
 					Client version mismatch, please refresh:{' '}
 					<button onClick={() => {
 						waitingWorker.postMessage({ type: 'SKIP_WAITING' });
-						navigator.serviceWorker.addEventListener('controllerchange', () => {
-							window.location.reload();
+						const reload = () => window.location.reload();
+						navigator.serviceWorker.addEventListener('controllerchange', reload, { once: true });
+
+						// Fallback for when the controller has already changed (ie. in another tab)
+						navigator.serviceWorker.getRegistration().then(reg => {
+							if (!reg || !reg.waiting) {
+								reload();
+							}
 						});
 					}}>
 						Refresh