diff --git a/src/GUI/qml/Location.qml b/src/GUI/qml/Location.qml
index 429522a8e..a080e5a77 100644
--- a/src/GUI/qml/Location.qml
+++ b/src/GUI/qml/Location.qml
@@ -25,6 +25,9 @@ Item {
         _location.addToRecent(selectedLocation);
 
         if (selectedLocation.isAirportType) {
+            // default to using the active runway when making a selection
+            // via the GUI
+            _location.useActiveRunway = true
             detailLoader.sourceComponent = airportDetails
         } else {
             detailLoader.sourceComponent = navaidDetails
diff --git a/src/GUI/qml/LocationAirportView.qml b/src/GUI/qml/LocationAirportView.qml
index 0174fcbb7..ddb193d48 100644
--- a/src/GUI/qml/LocationAirportView.qml
+++ b/src/GUI/qml/LocationAirportView.qml
@@ -36,12 +36,12 @@ Item {
     // not very declarative, try to remove this over time
     function syncUIFromController()
     {
-        if (_location.detail.isRunwayType) {
-            runwayRadio.select();
-            runwayChoice.syncCurrentIndex();
-        } else if (_location.detail.type == Positioned.Parking) {
+        if (_location.detail.type == Positioned.Parking) {
             parkingRadio.select()
             parkingChoice.syncCurrentIndex();
+        } else {
+            runwayRadio.select();
+            runwayChoice.syncCurrentIndex();
         }
     }