diff --git a/src/components/common/PinCodeInput.vue b/src/components/common/PinCodeInput.vue
index 2a279856..cc41aa96 100644
--- a/src/components/common/PinCodeInput.vue
+++ b/src/components/common/PinCodeInput.vue
@@ -163,45 +163,45 @@ export default {
             }
         },
         onKeydown(index, event) {
-            if (event.altKey || (event.code.indexOf('F') === 0 && (event.code.length === 2 || event.code.length === 3))) {
+            if (event.altKey || (event.key.indexOf('F') === 0 && (event.key.length === 2 || event.key.length === 3))) {
                 return;
             }
 
-            if (event.code === 'Enter' && this.finalPinCode.length === this.length) {
+            if (event.key === 'Enter' && this.finalPinCode.length === this.length) {
                 this.$emit('pincode:confirm', this.finalPinCode);
                 event.preventDefault();
                 return;
             }
 
-            if (event.code === 'ArrowLeft' || (event.shiftKey && event.code === 'Tab')) {
+            if (event.key === 'ArrowLeft' || (event.shiftKey && event.key === 'Tab')) {
                 this.setPreviousFocus(index);
                 event.preventDefault();
                 return;
             }
 
-            if (event.code === 'ArrowRight' || (!event.shiftKey && event.code === 'Tab')) {
+            if (event.key === 'ArrowRight' || (!event.shiftKey && event.key === 'Tab')) {
                 this.setNextFocus(index);
                 event.preventDefault();
                 return;
             }
 
-            if (event.code === 'Home') {
+            if (event.key === 'Home') {
                 this.setFocus(0);
                 event.preventDefault();
                 return;
             }
 
-            if (event.code === 'End') {
+            if (event.key === 'End') {
                 this.setFocus(this.length - 1);
                 event.preventDefault();
                 return;
             }
 
-            if ((event.ctrlKey || event.metaKey) && event.code === 'KeyV') {
+            if (((event.ctrlKey || event.metaKey) && event.key === 'v') || event.key === 'Paste') {
                 return;
             }
 
-            if (event.code === 'Backspace' || event.code === 'Delete' || event.code === 'Del') {
+            if (event.key === 'Backspace' || event.key === 'Delete' || event.key === 'Del') {
                 for (let i = index; i < this.codes.length; i++) {
                     this.codes[i].value = '';
                     this.setInputType(i);
@@ -215,7 +215,7 @@ export default {
                 return;
             }
 
-            if (event.code.indexOf('Digit') === 0 && event.code.length === 6) {
+            if (event.key.length === 1 && '0' <= event.key && event.key <= '9') {
                 this.codes[index].value = event.key;
                 this.setInputType(index);
                 this.setNextFocus(index);
diff --git a/src/components/desktop/AmountInput.vue b/src/components/desktop/AmountInput.vue
index 8945c715..d89d2138 100644
--- a/src/components/desktop/AmountInput.vue
+++ b/src/components/desktop/AmountInput.vue
@@ -142,17 +142,17 @@ export default {
     },
     methods: {
         onKeyUpDown(e) {
-            if (e.altKey || e.ctrlKey || e.metaKey || (e.code.indexOf('F') === 0 && (e.code.length === 2 || e.code.length === 3))
-                || e.code === 'ArrowLeft' || e.code === 'ArrowRight'
-                || e.code === 'Home' || e.code === 'End' || e.code === 'Tab'
-                || e.code === 'Backspace' || e.code === 'Delete' || e.code === 'Del') {
+            if (e.altKey || e.ctrlKey || e.metaKey || (e.key.indexOf('F') === 0 && (e.key.length === 2 || e.key.length === 3))
+                || e.key === 'ArrowLeft' || e.key === 'ArrowRight'
+                || e.key === 'Home' || e.key === 'End' || e.key === 'Tab'
+                || e.key === 'Backspace' || e.key === 'Delete' || e.key === 'Del') {
                 return;
             }
 
             const digitGroupingSymbol = this.$locale.getCurrentDigitGroupingSymbol(this.userStore);
             const decimalSeparator = this.$locale.getCurrentDecimalSeparator(this.userStore);
 
-            if (e.code.indexOf('Digit') !== 0 && e.code !== 'Minus' && e.key !== decimalSeparator) {
+            if (!('0' <= e.key && e.key <= '9') && e.key !== '-' && e.key !== decimalSeparator) {
                 e.preventDefault();
                 return;
             }
@@ -163,7 +163,7 @@ export default {
                 str = removeAll(str, digitGroupingSymbol);
             }
 
-            if (e.code === 'Minus' && str.lastIndexOf('-') > 0) {
+            if (e.key === '-' && str.lastIndexOf('-') > 0) {
                 const lastMinusPos = str.lastIndexOf('-');
                 e.target.value = str.substring(0, lastMinusPos) + str.substring(lastMinusPos + 1, str.length);
                 this.currentValue = e.target.value;
@@ -205,7 +205,7 @@ export default {
                     str = str.substring(1);
                 }
 
-                while (str.charAt(0) === '0' && (str.length >= 2 || e.code !== 'Digit0')) {
+                while (str.charAt(0) === '0' && (str.length >= 2 || e.key !== '0')) {
                     str = str.substring(1);
                 }