diff --git a/src/GUI/NavaidSearchModel.cxx b/src/GUI/NavaidSearchModel.cxx
index 4a4a9232f..5b43175aa 100644
--- a/src/GUI/NavaidSearchModel.cxx
+++ b/src/GUI/NavaidSearchModel.cxx
@@ -34,6 +34,9 @@ QString fixNavaidName(QString s)
     QStringList words = s.split(QChar(' '));
     QStringList changedWords;
     Q_FOREACH(QString w, words) {
+        if (w.isEmpty())
+            continue;
+            
         QString up = w.toUpper();
 
         // expand common abbreviations