diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index 2bf1123b..fe608110 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -131,15 +131,15 @@
 
 		previousLang = previousLanguages.slice( -1 )[0];
 
+		$ulsTrigger = ( ulsPosition === 'interlanguage' ) ?
+					$( '.uls-settings-trigger' ) :
+					$( '.uls-trigger' );
+
 		if ( previousLang === currentLang  ) {
-			// Do not show tooltip nor update language list
+			$ulsTrigger.tipsy( { gravity: rtlPage ? 'e' : 'w' } );
 			return true;
 		}
 
-		$ulsTrigger = ( ulsPosition === 'interlanguage' ) ?
-			$( '.uls-settings-trigger' ) :
-			$( '.uls-trigger' );
-
 		previousLanguages.push( currentLang );
 		mw.uls.setPreviousLanguages( previousLanguages );
 
@@ -151,8 +151,6 @@
 			return true;
 		}
 
-		// Remove existing tipsy tooltip
-		$ulsTrigger.removeData( 'tipsy' );
 		// Attach a tipsy tooltip to the trigger
 		$ulsTrigger.tipsy( {
 			gravity: tipsyGravity[ulsPosition],
@@ -244,8 +242,7 @@
 			// Add an element near the interlanguage links header
 			$ulsSettingsTrigger = $( '<span>' )
 				.addClass( 'uls-settings-trigger' )
-				.attr( 'title', $.i18n( 'ext-uls-language-settings-title' ) )
-				.tipsy( { gravity: rtlPage ? 'e' : 'w' } );
+				.attr( 'title', $.i18n( 'ext-uls-language-settings-title' ) );
 			// Append ULS cog to languages section. But make sure it is visible.
 			$pLang.show().prepend( $ulsSettingsTrigger );