diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index 5474294b..00e1a212 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -429,6 +429,27 @@
 		} );
 	}
 
+	/**
+	 * Special handling for checkbox hack.
+	 * Disable default checkbox behavior and bind click to "Enter" keyboard events
+	 */
+	function handleCheckboxSelector() {
+		// If the ULS button is also a checkbox, we can
+		// conclude that it's using the checkbox hack.
+		$( document ).on( 'input', 'input.mw-interlanguage-selector[type="checkbox"]', function ( ev ) {
+			var elem = ev.currentTarget;
+			elem.checked = false;
+		} );
+
+		$( document ).on( 'keydown', 'input.mw-interlanguage-selector[type="checkbox"]', function ( ev ) {
+			var elem = ev.currentTarget;
+			if ( ev.key !== 'Enter' ) {
+				return;
+			}
+			elem.click();
+		} );
+	}
+
 	/**
 	 * Load and open ULS for content language selection.
 	 *
@@ -438,29 +459,15 @@
 	 * @param {jQuery.Event} ev
 	 */
 	function loadContentLanguageSelector( ev ) {
-		var targetNode = ev.currentTarget,
-			$target = $( targetNode );
-		ev.preventDefault();
-		// Special handling for checkboxes
-		if (
-			targetNode &&
-			targetNode.tagName === 'INPUT' &&
-			targetNode.getAttribute( 'type' ) === 'checkbox'
-		) {
-			// Disabled checked status. If the ULS button is also a checkbox, we can
-			// conclude that it's using the checkbox hack.
-			// Setting checked to false disables the default behavior of that checkbox.
-			targetNode.checked = false;
-			$target.on( 'click', function () {
-				targetNode.checked = false;
-			} );
-		}
+		var $target = $( ev.currentTarget );
 
 		// Avoid reinitializing ULS multiple times for an element
 		if ( $target.attr( 'data-uls-loaded' ) ) {
 			return;
 		}
 
+		ev.preventDefault();
+
 		mw.loader.using( 'ext.uls.mediawiki' ).then( function () {
 			var parent, languageNodes, standalone, uls;
 
@@ -505,7 +512,8 @@
 			// module may run simultaneously. Using event delegation to avoid race conditions where
 			// the trigger may be created after this code.
 			$( document ).on( 'click', '.mw-interlanguage-selector', loadContentLanguageSelector );
-
+			// Special handling for checkbox hack.
+			handleCheckboxSelector();
 		}
 	}