diff --git a/objects/obj_fleet_select/Draw_0.gml b/objects/obj_fleet_select/Draw_0.gml
index f5a2b41995..c3b63b7cbb 100644
--- a/objects/obj_fleet_select/Draw_0.gml
+++ b/objects/obj_fleet_select/Draw_0.gml
@@ -54,9 +54,6 @@ if (player_fleet.just_left){
         }
     }
 }
-if (!currently_entered){
-    currently_entered =  keyboard_check(vk_shift);
-}
 
 if (owner  == eFACTION.Player) and (player_fleet.action==""){
     var xx = __view_get( e__VW.XView, 0 );
@@ -157,7 +154,9 @@ if (owner  == eFACTION.Player) and (player_fleet.action==""){
         instance_activate_object(obj_star);
     }
 }
-
+if (!currently_entered){
+    currently_entered =  keyboard_check(vk_shift);
+}
 if (mouse_check_button_pressed(mb_left) ){
     if (!currently_entered && point_distance(mouse_x,mouse_y,player_fleet.x,player_fleet.y)>32 && !keyboard_check(vk_shift)){
         instance_destroy();
diff --git a/scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.gml b/scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.gml
index c03017b4da..fafd339a40 100644
--- a/scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.gml
+++ b/scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.gml
@@ -136,13 +136,13 @@ function draw_warp_lanes(){
 
 			var hit_box = [route_coords[0]+dist_x-(warp_width/2),route_coords[1]+dist_y-(warp_height/2), route_coords[0]+dist_x+(warp_width/2) ,route_coords[1]+dist_y+(warp_height/2) ];
 			
-			var allow_tooltips = (!instance_exists(obj_star_select))
+			var _allow_tooltips = (!instance_exists(obj_star_select))
 
-			if (allow_tooltips && instance_exists(obj_fleet_select)){
+			if (_allow_tooltips && instance_exists(obj_fleet_select)){
 
 				var mouse_consts = return_mouse_consts();
 
-				allow_tooltips = !obj_fleet_select.currently_entered || (mouse_consts[0] - __view_get( e__VW.XView, 0 ) > 300);
+				_allow_tooltips = !obj_fleet_select.currently_entered || (mouse_consts[0] - __view_get( e__VW.XView, 0 ) > 300);
 			}
 			var warp_route_tooltip = "Major warp route to {0} (x4 travel speed for warp capable crafts)\n\nHold Shift and click Left Mouse Button to see destination.";
 			if (scr_hit(hit_box)){
@@ -158,7 +158,7 @@ function draw_warp_lanes(){
 					var to = instance_nearest(route_coords[2],route_coords[3], obj_star);
 					// warp_point_hover = true;
 
-					if (allow_tooltips){
+					if (_allow_tooltips){
 						tooltip_draw(string(warp_route_tooltip, to.name));
 					}
 
@@ -193,7 +193,7 @@ function draw_warp_lanes(){
 					var to = instance_nearest(route_coords[0], route_coords[1], obj_star);
 					// warp_point_hover = true;
 
-					if (allow_tooltips){
+					if (_allow_tooltips){
 						tooltip_draw(string(warp_route_tooltip, to.name));
 					}