diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc
index 44702dd5aac7fa272e782fd870cce886d6ec9198..b664e73353976cbc54d889ebad0a577315533196 100644
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -390,13 +390,15 @@ void WaypointList::currentWaypointEditableChanged(quint16 seq)
             {
                 WaypointEditableView* widget = wpEditableViews.find(waypoints[i]).value();
 
-                if (waypoints[i]->getId() == seq)
-                {
-                    widget->setCurrent(true);
-                }
-                else
-                {
-                    widget->setCurrent(false);
+                if (widget) {
+                    if (waypoints[i]->getId() == seq)
+                    {
+                        widget->setCurrent(true);
+                    }
+                    else
+                    {
+                        widget->setCurrent(false);
+                    }
                 }
             }
         }