diff --git a/kfet/static/kfet/js/kpsul.js b/kfet/static/kfet/js/kpsul.js
index 374068f3..12a80d94 100644
--- a/kfet/static/kfet/js/kpsul.js
+++ b/kfet/static/kfet/js/kpsul.js
@@ -85,7 +85,7 @@ class AccountManager {
         $('#id_on_acc').val(this.account.id);
         this.display();
 
-        kpsul._env.articleSelect.focus();
+        kpsul.article_manager.focus();
         kpsul._env.updateBasketAmount();
         kpsul._env.updateBasketRel();
     }
@@ -268,7 +268,7 @@ class CheckoutManager {
         if (kpsul.account_manager.is_empty()) {
             kpsul.account_manager.focus();
         } else {
-            kpsul._env.articleSelect.focus().select();
+            kpsul.article_manager.focus();
         }
     }
 
@@ -482,7 +482,11 @@ class ArticleManager {
     }
 
     focus() {
-        this._$input.focus();
+        if this.is_empty()
+            this._$input.focus();
+        else
+            this._$nb.focus();
+
         return this;
     }
 
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index dd7d4cdb..283c4692 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -191,7 +191,7 @@ $(document).ready(function() {
 
         commentDialog.open({
             callback: confirm_callback,
-            next_focus: articleSelect
+            next_focus: kpsul.article_manager;
         });
     }
 
@@ -237,7 +237,7 @@ $(document).ready(function() {
                 else
                     displayErrors(getErrorsHtml(response));
             },
-            next_focus: articleSelect,
+            next_focus: kpsul.article_manager,
         });
     }
 
@@ -273,15 +273,6 @@ $(document).ready(function() {
         cancelOperations();
     });
 
-    // -----
-    // Articles data
-    // -----
-
-    var articleSelect = $('#article_autocomplete');
-    var articleId = $('#article_id');
-    var articleNb = $('#article_number');
-    var articlesList = [];
-
     // -----
     // Basket
     // -----
@@ -527,11 +518,9 @@ $(document).ready(function() {
             addDeposit(amount);
         }
 
-        var next_focus = articleSelect.val() ? articleNb : articleSelect ;
-
         depositDialog.open({
             callback: callback,
-            next_focus: next_focus,
+            next_focus: kpsul.article_manager,
         });
     }
 
@@ -547,11 +536,9 @@ $(document).ready(function() {
             addEdit(amount);
         }
 
-        var next_focus = articleSelect.val() ? articleNb : articleSelect ;
-
         editDialog.open({
             callback: callback,
-            next_focus: next_focus,
+            next_focus: kpsul.article_manager,
         });
     }
 
@@ -567,11 +554,9 @@ $(document).ready(function() {
             addWithdraw(amount);
         }
 
-        var next_focus = articleSelect.val() ? articleNb : articleSelect ;
-
         withdrawDialog.open({
             callback: callback,
-            next_focus: next_focus,
+            next_focus: kpsul.article_manager,
         });
     }
 
@@ -862,7 +847,7 @@ $(document).ready(function() {
                 } else {
                     // F2 - Basket reset
                     resetBasket();
-                    articleSelect.focus();
+                    kpsul.article_manager.focus();
                 }
                 return false;
             case 114: