diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
index 940c4b92..9020fa99 100644
--- a/js/jquery.mobile.navigation.js
+++ b/js/jquery.mobile.navigation.js
@@ -337,6 +337,13 @@
 			}
 		}
 
+		function releasePageTransitionLock(){
+			isPageTransitioning = false;
+			if(pageTransitionQueue.length>0) {
+				$.mobile.changePage.apply($.mobile, pageTransitionQueue.pop());
+			}
+		}
+		
 		//function for transitioning between two existing pages
 		function transitionPages() {
 		    $.mobile.silentScroll();
@@ -398,10 +405,7 @@
 				//remove initial build class (only present on first pageshow)
 				$html.removeClass( "ui-mobile-rendering" );
 
-				isPageTransitioning = false
-				if(pageTransitionQueue.length>0) {
-					$.mobile.changePage.apply($.mobile, pageTransitionQueue.pop());
-				}
+				releasePageTransitionLock();
 			};
 
 			function addContainerClass(className){
@@ -435,7 +439,7 @@
 
 				// callback - remove classes, etc
 				to.animationComplete(function() {
-					from.add( to ).removeClass("out in reverse " + transition );
+					to.add(from).removeClass("out in reverse " + transition );
 					if( from ){
 						from.removeClass( $.mobile.activePageClass );
 					}	
@@ -566,6 +570,7 @@
 						.fadeOut( 400, function(){
 							$(this).remove();
 						});
+					releasePageTransitionLock();
 				}
 			});
 		}
diff --git a/tests/unit/navigation/index.html b/tests/unit/navigation/index.html
index db29322b..daeaf3c2 100644
--- a/tests/unit/navigation/index.html
+++ b/tests/unit/navigation/index.html
@@ -47,8 +47,6 @@
 <ol id="qunit-tests">
 </ol>
 
-<!-- NOTE body must be used in place of main otherwise transition behaviour fails -->
-
 <div id="foo" data-role="page">
 	<a href="#bar" data-transition="flip"></a>
 </div>