diff --git a/script/engine.js b/script/engine.js
index c389266..05c9b3a 100644
--- a/script/engine.js
+++ b/script/engine.js
@@ -593,14 +593,10 @@
 			//return (num > 0 ? "+" : "") + num + " per " + delay + "s";
 		},
 
+		keyLock: false,
 		tabNavigation: true,
+		restoreNavigation: false,
 
-		restoreNavigation: function(){
-			setTimeout(function(){
-				Engine.tabNavigation = true;
-			},100);
-		},
-	
 		keyDown: function(e) {
 			e = e || window.event;
 			if(!Engine.keyPressed && !Engine.keyLock) {
@@ -616,9 +612,7 @@
 			Engine.pressed = false;
 			if(Engine.activeModule.keyUp) {
 				Engine.activeModule.keyUp(e);
-			}
-			else
-			{
+			} else {
 				switch(e.which) {
 					case 38: // Up
 					case 87:
@@ -666,7 +660,10 @@
 						break;
 				}
 			}
-
+			if(Engine.restoreNavigation){
+				Engine.tabNavigation = true;
+				Engine.restoreNavigation = false;
+			}
 			return false;
 		},
 
diff --git a/script/world.js b/script/world.js
index c0d2861..fc21853 100644
--- a/script/world.js
+++ b/script/world.js
@@ -823,7 +823,7 @@ var World = {
 					$('#outerSlider').animate({opacity:'1'}, 600, 'linear');
 					Button.cooldown($('#embarkButton'));
 					Engine.keyLock = false;
-					Engine.restoreNavigation();
+					Engine.tabNavigation = true;
 				}, 2000, true);
 			});
 		}
@@ -866,7 +866,7 @@ var World = {
 		$('#outerSlider').animate({left: '0px'}, 300);
 		Engine.activeModule = Path;
 		Path.onArrival();
-		Engine.restoreNavigation();
+		Engine.restoreNavigation = true;
 	},
 	
 	leaveItAtHome: function(thing) {