diff --git a/src/MissionManager/QGCMapPolygon.cc b/src/MissionManager/QGCMapPolygon.cc
index acd949a0f94e9a3b268d4e8d52bbfd5cf6d8415c..804ab69637771b8945cba4fc7b07fc33017a853d 100644
--- a/src/MissionManager/QGCMapPolygon.cc
+++ b/src/MissionManager/QGCMapPolygon.cc
@@ -632,7 +632,7 @@ void QGCMapPolygon::selectVertex(int index)
 {
     if(index == _selectedVertexIndex) return;   // do nothing
 
-    if((0 <= index && index < count()) || index == -1) {
+    if(-1 <= index && index < count()) {
         _selectedVertexIndex = index;
     } else {
         qWarning() << "QGCMapPolygon: Selected vertex index is out of bounds!";
diff --git a/src/MissionManager/QGCMapPolyline.cc b/src/MissionManager/QGCMapPolyline.cc
index ba37e98a111346d29802eec9279942b0e3923d47..aec2a01c19c189de17dbf52482faae3943625a4b 100644
--- a/src/MissionManager/QGCMapPolyline.cc
+++ b/src/MissionManager/QGCMapPolyline.cc
@@ -449,7 +449,7 @@ void QGCMapPolyline::selectVertex(int index)
 {
     if(index == _selectedVertexIndex) return;   // do nothing
 
-    if((0 <= index && index < count()) || index == -1) {
+    if(-1 <= index && index < count()) {
         _selectedVertexIndex = index;
     } else {
         qWarning() << "QGCMapPolyline: Selected vertex index is out of bounds!";