diff --git a/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue b/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
index 7804e80e..a7ba2cde 100644
--- a/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
+++ b/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
@@ -227,24 +227,13 @@ export default {
       if (!this.isEmptyValue(keyValue.subKeyLayoutUuid)) {
         this.loadKeyLayout(keyValue.subKeyLayoutUuid)
       } else {
-        const products = this.listOrderLine.find(item => item.lineDescription === keyValue.name)
-        // TODO: Change this dispatch
-        if (!this.isEmptyValue(products) && keyValue.quantity > 1) {
-          this.$store.dispatch('notifyActionKeyPerformed', {
-            value: {
-              QtyEntered: keyValue.quantity,
-              value: keyValue.name
-            }
-          })
-        } else {
-          this.$store.dispatch('notifyActionKeyPerformed', {
-            columnName: 'ProductValue',
-            value: {
-              QtyEntered: keyValue.quantity,
-              value: keyValue.name
-            }
-          })
-        }
+        this.$store.dispatch('notifyActionKeyPerformed', {
+          columnName: 'ProductValue',
+          value: {
+            QtyEntered: keyValue.quantity,
+            value: keyValue.productValue
+          }
+        })
       }
     },
     handleCommand(command) {
diff --git a/src/utils/ADempiere/apiConverts/pos.js b/src/utils/ADempiere/apiConverts/pos.js
index a3fa2ed6..bbad5c57 100644
--- a/src/utils/ADempiere/apiConverts/pos.js
+++ b/src/utils/ADempiere/apiConverts/pos.js
@@ -115,7 +115,7 @@ export function convertKey(keyToConvert) {
     sequence: keyToConvert.sequence,
     spanX: keyToConvert.span_x,
     spanY: keyToConvert.span_y,
-    productUuid: keyToConvert.product_uuid,
+    productValue: keyToConvert.product_value,
     quantity: keyToConvert.quantity,
     resourceReference: convertResourceReference(
       keyToConvert.resource_reference