diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js
index e46be649f..241666d43 100644
--- a/apps/gpsnav/app_b2.js
+++ b/apps/gpsnav/app_b2.js
@@ -43,7 +43,7 @@ function drawCompass(course) {
     }
     xpos += 12;
   }
-  if (wpindex != 0) {
+  if (wpindex >= 0) {
     var bpos = brg - course;
     if (bpos > 180) bpos -= 360;
     if (bpos < -180) bpos += 360;
@@ -241,7 +241,7 @@ function nextwp(inc) {
 }
 
 function doselect() {
-  if (selected && wpindex != 0 && waypoints[wpindex].lat === undefined && savedfix.fix) {
+  if (selected && wpindex >= 0 && waypoints[wpindex].lat === undefined && savedfix.fix) {
     waypoints[wpindex] = {
       name: "@" + wp.name,
       lat: savedfix.lat,
@@ -265,4 +265,4 @@ drawAll();
 startTimers();
 Bangle.on('GPS', onGPS);
 // Toggle selected
-setButtons();
\ No newline at end of file
+setButtons();