diff --git a/src/GUI/LocationWidget.cxx b/src/GUI/LocationWidget.cxx
index 4d5515cc9..162a7c5d9 100644
--- a/src/GUI/LocationWidget.cxx
+++ b/src/GUI/LocationWidget.cxx
@@ -668,6 +668,11 @@ void LocationWidget::onSearchComplete()
 void LocationWidget::onLocationChanged()
 {
     bool locIsAirport = FGAirport::isAirportType(m_location.ptr());
+    if (!m_location) {
+        onBackToSearch();
+        return;
+    }
+
     m_backButton->show();
 
     if (locIsAirport) {