diff --git a/src/popup.cpp b/src/popup.cpp
index a07b9a2a8a1d3..017f7d63e3da7 100644
--- a/src/popup.cpp
+++ b/src/popup.cpp
@@ -369,7 +369,7 @@ query_popup::result query_popup::query_once()
     } else {
         for( size_t ind = 0; ind < options.size(); ++ind ) {
             if( res.action == options[ind].action ) {
-                cur = ind;
+                impl->keyboard_selected_option = ind;
                 if( options[ind].filter( res.evt ) ) {
                     res.wait_input = false;
                     break;