diff --git a/resources/js/ext.uls.eventlogger.js b/resources/js/ext.uls.eventlogger.js
index 44bfa215..19643e88 100644
--- a/resources/js/ext.uls.eventlogger.js
+++ b/resources/js/ext.uls.eventlogger.js
@@ -88,7 +88,7 @@
 			mw.hook( 'mw.uls.webfonts.enable' ).add( $.proxy( this.enableWebfonts, this ) );
 			mw.hook( 'mw.uls.webfonts.disable' ).add( $.proxy( this.disableWebfonts, this ) );
 
-			$( 'body' ).on( 'noresults.uls', '.uls-menu .languagefilter',
+			$( 'body' ).on( 'noresults.uls', '.uls-menu .uls-languagefilter',
 				$.proxy( this.noSearchResults, this )
 			);
 		},
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index eca413e7..d7c493b9 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -60,11 +60,11 @@
 		// Remove previous values when reinitializing
 		mw.uls.languageSelectionMethod = undefined;
 
-		$( '#map-block' ).on( 'click', function () {
+		$( '#uls-map-block' ).on( 'click', function () {
 			mw.uls.languageSelectionMethod = 'map';
 		} );
 
-		$( '#languagefilter' ).on( 'keydown', function () {
+		$( '#uls-languagefilter' ).on( 'keydown', function () {
 			// If it's the first letter,
 			// log the usage of the search box
 			if ( $( this ).val() === '' ) {