diff --git a/source/app/models/main.py b/source/app/models/main.py
index f95dcd2..922126c 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -832,9 +832,8 @@ class Productos(BaseModel):
     @classmethod
     def next_key(cls):
         value = (Productos
-            .select(fn.Max(Productos.id))
-            .group_by(Productos.id)
-            .order_by(Productos.id)
+            .select(fn.Max(Productos.id).alias('fm'))
+            .order_by(SQL('fm'))
             .scalar())
         if value is None:
             value = 1
diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js
index 20c3d3f..86c7568 100644
--- a/source/static/js/controller/invoices.js
+++ b/source/static/js/controller/invoices.js
@@ -95,7 +95,7 @@ function cmd_new_invoice_click(id, e, node){
     grid_totals.clearAll()
     grid_totals.add({id: 1, concepto: 'SubTotal', importe: 0})
     $$('multi_invoices').setValue('invoices_new')
-    form.focus('search_client_id')
+    form.focus('search_client_name')
 }