diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 7167f2ff..56ba42d9 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -336,6 +336,11 @@ $(document).ready(function() {
     // Event listener
     checkoutInput.on('change', function() {
         retrieveCheckoutData(checkoutInput.val());
+        if (account_data['trigramme']) {
+            articleSelect.focus().select();
+        } else {
+            triInput.focus().select();
+        }
     });
 
     // -----