[bugfix] focus/pull-up selection was not behaving according to description

 * This is related to the fix in commit b9d325e
 * Few other places needed to be adjusted to get it to behave as the option's
   description suggests.