diff --git a/public_html/gmap.html b/public_html/gmap.html
index f62d063..d2c1350 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -122,10 +122,10 @@
                                         <span id="selected_registration"></span>
                                         <span id="selected_icaotype"></span>
                                         <span id="selected_emergency"></span>
+                                        <a id="selected_flightaware_link" href="" target="_blank">[FlightAware]</a>
                                         <span id="selected_links">
                                           <a id="selected_fr24_link" href="" target="_blank">[FR24]</a>
                                           <a id="selected_flightstats_link" href="" target="_blank">[FlightStats]</a>
-                                          <a id="selected_flightaware_link" href="" target="_blank">[FlightAware]</a>
                                         </span>
                                       </td>
                                     </tr>
diff --git a/public_html/script.js b/public_html/script.js
index 823f228..3795f9a 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -613,13 +613,14 @@ function refreshSelected() {
         
         $('#dump1090_infoblock').css('display','none');
         $('#selected_infoblock').css('display','block');
+
+        $('#selected_flightaware_link').attr('href','http://flightaware.com/live/modes/'+selected.icao+'/redirect');
         
         if (selected.flight !== null && selected.flight !== "") {
                 $('#selected_callsign').text(selected.flight);
                 $('#selected_links').css('display','inline');
                 $('#selected_fr24_link').attr('href','http://fr24.com/'+selected.flight);
                 $('#selected_flightstats_link').attr('href','http://www.flightstats.com/go/FlightStatus/flightStatusByFlight.do?flightNumber='+selected.flight);
-                $('#selected_flightaware_link').attr('href','http://flightaware.com/live/flight/'+selected.flight);
         } else {
                 $('#selected_callsign').text('n/a');
                 $('#selected_links').css('display','none');