diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
index db7df082..5f356dd2 100644
--- a/js/jquery.mobile.js
+++ b/js/jquery.mobile.js
@@ -191,10 +191,10 @@
 	
 	//remove active classes after page transition or error
 	function removeActiveLinkClass(){
-		if(activeClickedLink){
+		if(activeClickedLink && !activeClickedLink.closest( '.ui-page-active' ).length ){
 			activeClickedLink.removeClass( activeBtnClass );
-			activeClickedLink = null;
 		}
+		activeClickedLink = null;
 	}