diff --git a/locales/en/messages.json b/locales/en/messages.json
index 3ae750aa35..b24861d246 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -2714,12 +2714,6 @@
     "gpsAltitude": {
         "message": "Altitude:"
     },
-    "gpsLat": {
-        "message": "Latitude:"
-    },
-    "gpsLon": {
-        "message": "Longitude:"
-    },
     "gpsHeading": {
         "message": "Heading:"
     },
diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js
index 9ff6b7b6ba..340c099b40 100644
--- a/src/js/tabs/setup.js
+++ b/src/js/tabs/setup.js
@@ -194,8 +194,6 @@ setup.initialize = function (callback) {
             arming_disable_flags_e = $('.arming-disable-flags'),
             gpsFix_e = $('.GPS_info span.colorToggle'),
             gpsSats_e = $('.gpsSats'),
-            gpsLat_e = $('.gpsLat'),
-            gpsLon_e = $('.gpsLon'),
             roll_e = $('dd.roll'),
             pitch_e = $('dd.pitch'),
             heading_e = $('dd.heading'),
@@ -428,14 +426,15 @@ setup.initialize = function (callback) {
             }
 
             // GPS info is acquired in the background using update_live_status() in serial_backend.js
-
             gpsFix_e.text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse'));
             gpsFix_e.toggleClass('ready', FC.GPS_DATA.fix != 0);
-
-            const gspUnitText = i18n.getMessage('gpsPositionUnit');
             gpsSats_e.text(FC.GPS_DATA.numSat);
-            gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} ${gspUnitText}`);
-            gpsLon_e.text(`${(FC.GPS_DATA.lon / 10000000).toFixed(4)} ${gspUnitText}`);
+
+            const lat = FC.GPS_DATA.lat / 10000000;
+            const lon = FC.GPS_DATA.lon / 10000000;
+            const url = `https://maps.google.com/?q=${lat},${lon}`;
+            const gpsUnitText = i18n.getMessage('gpsPositionUnit');
+            $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} ${gpsUnitText} / ${lon.toFixed(4)} ${gpsUnitText}`);
         }
 
         function get_fast_data() {
diff --git a/src/tabs/setup.html b/src/tabs/setup.html
index f8d85a1c68..a1b500dd39 100644
--- a/src/tabs/setup.html
+++ b/src/tabs/setup.html
@@ -128,12 +128,8 @@
                                 <td class="gpsSats"></td>
                             </tr>
                             <tr>
-                                <td i18n="gpsLat"></td>
-                                <td class="gpsLat"></td>
-                            </tr>
-                            <tr class="noboarder">
-                                <td i18n="gpsLon"></td>
-                                <td class="gpsLon"></td>
+                                <td i18n="gpsLatLon"></td>
+                                <td class="latLon"><a href="#" target="_blank">0.0000 deg</a></td>
                             </tr>
                             </tbody>
                         </table>