diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index e83a18b7be..519b5cc6d4 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -363,7 +363,7 @@ static void glui_render_menu_list(glui_handle_t *glui,
 
       menu_entries_get(i, &entry);
 
-      entry_selected = nav->selection_ptr == i;
+      entry_selected = (nav->selection_ptr == i);
 
       glui_render_label_value(glui, y, width, *frame_count / 40,
          entry_selected ? hover_color : normal_color, entry_selected,
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
index 9c8e49322b..8c42b3dee5 100644
--- a/menu/menu_navigation.c
+++ b/menu/menu_navigation.c
@@ -92,8 +92,7 @@ void menu_navigation_clear(menu_navigation_t *nav, bool pending_push)
    if (!nav)
       return;
 
-   nav->selection_ptr = 0;
-
+   menu_navigation_set(nav, 0, true);
    menu_driver_navigation_clear(pending_push);
 }