diff --git a/browser/src/map/handler/Map.Keyboard.js b/browser/src/map/handler/Map.Keyboard.js
index b69886dd2..c725e18b3 100644
--- a/browser/src/map/handler/Map.Keyboard.js
+++ b/browser/src/map/handler/Map.Keyboard.js
@@ -451,6 +451,9 @@ L.Map.Keyboard = L.Handler.extend({
 			return;
 		}
 
+		// if any key is pressed, we stop the following other users
+		this._map.userList.followUser(this._map._docLayer._viewId);
+
 		if (window.KeyboardShortcuts.processEvent(app.UI.language.fromURL, ev)) {
 			ev.preventDefault();
 			return;
@@ -602,9 +605,6 @@ L.Map.Keyboard = L.Handler.extend({
 			}
 		}
 
-		// if any key is pressed, we stop the following other users
-		this._map.userList.followUser(this._map._docLayer._viewId);
-
 		L.DomEvent.stopPropagation(ev);
 	},