diff --git a/public_html/planeObject.js b/public_html/planeObject.js
index 7cfec07..d1b7593 100644
--- a/public_html/planeObject.js
+++ b/public_html/planeObject.js
@@ -257,7 +257,7 @@ PlaneObject.prototype.updateTick = function(receiver_timestamp) {
                         this.clearMarker();
                         this.visible = false;
 			if (SelectedPlane == this.icao)
-                                selectPlaneByHex(null);
+                                selectPlaneByHex(null,false);
                 }
 	} else {
                 this.visible = true;
@@ -301,7 +301,8 @@ PlaneObject.prototype.updateMarker = function(moved) {
 		});
                 
 		// Trap clicks for this marker.
-		google.maps.event.addListener(this.marker, 'click', selectPlaneByHex.bind(undefined,this.icao));
+		google.maps.event.addListener(this.marker, 'click', selectPlaneByHex.bind(undefined,this.icao,false));
+		google.maps.event.addListener(this.marker, 'dblclick', selectPlaneByHex.bind(undefined,this.icao,true));
 	}
         
 	// Setting the marker title
diff --git a/public_html/script.js b/public_html/script.js
index 6e0fa72..c800b3f 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -872,7 +872,7 @@ function resetMap() {
 	GoogleMap.setZoom(ZoomLvl);
 	GoogleMap.setCenter(new google.maps.LatLng(CenterLat, CenterLon));
 	
-	selectPlaneByHex(null);
+	selectPlaneByHex(null,false);
 }
 
 function drawCircle(marker, distance) {