Revert "Revert "Add specific condition for back-key handle""