diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js
index ce9c7e8bd61..c5a4af4744a 100644
--- a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js
+++ b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js
@@ -150,7 +150,7 @@ export function init(id, invoke, value, changedEventCallback) {
 const handlerKeydown = (ac, e) => {
     const key = e.key;
     const { el, invoke, menu } = ac;
-    if (key === 'Enter' || key === 'NumpadEnter') {
+    if (key === 'Enter') {
         const skipEnter = el.getAttribute('data-bb-skip-enter') === 'true';
         if (!skipEnter) {
             const current = menu.querySelector('.active');
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js
index 5444af61044..920b88b1670 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js
@@ -39,6 +39,10 @@ export function init(id, invoke, closeCallback) {
     }
     confirm.hide = () => {
         const popover = getDescribedElement(el)
+        if (popover == null) {
+            return;
+        }
+
         popover.classList.remove('show')
 
         const children = popover.children
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js
index dd4aef00a77..7e826da835f 100644
--- a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js
+++ b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js
@@ -18,7 +18,7 @@ export function handleKeyUp(id, invoke, enter, enterCallbackMethod, esc, escCall
     const el = document.getElementById(id)
     if (el) {
         EventHandler.on(el, 'keyup', e => {
-            if (enter && (e.key === 'Enter' || e.key === 'NumpadEnter')) {
+            if (enter && (e.key === 'Enter')) {
                 const useShiftEnter = el.getAttribute('data-bb-shift-enter') === 'true';
                 if (!e.shiftKey && useShiftEnter) {
                     return;
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
index ebdb3de6961..fcb042aa7ea 100644
--- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
+++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
@@ -65,11 +65,11 @@ export function init(id) {
                     selectCell(el, index - 1)
                 }
             }
-            else if (current.selectionStart === current.value.length && (e.code === 'Space' || e.code === 'ArrowRight')) {
+            else if (current.selectionStart === current.value.length && (e.key === 'Space' || e.key === 'ArrowRight')) {
                 e.preventDefault()
                 selectCell(el, index + 1)
             }
-            else if (current.selectionStart === 0 && e.code === 'ArrowLeft') {
+            else if (current.selectionStart === 0 && e.key === 'ArrowLeft') {
                 e.preventDefault()
                 selectCell(el, index - 1)
             }
diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.js b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.js
index 00b81b30acb..1c6a0f95477 100644
--- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.js
+++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.js
@@ -37,11 +37,11 @@ export function init(id, invoke, options) {
         const triggerSpace = e.target.getAttribute('data-bb-trigger-key') === 'space';
         let submit = false;
         if (triggerSpace) {
-            if (e.code === 'Space') {
+            if (e.key === 'Space') {
                 submit = true;
             }
         }
-        else if (e.code === 'Enter' || e.code === 'NumPadEnter') {
+        else if (e.key === 'Enter') {
             submit = true;
         }
 
diff --git a/src/BootstrapBlazor/Components/Textarea/Textarea.razor.js b/src/BootstrapBlazor/Components/Textarea/Textarea.razor.js
index 59b19ea25d4..7f38c490710 100644
--- a/src/BootstrapBlazor/Components/Textarea/Textarea.razor.js
+++ b/src/BootstrapBlazor/Components/Textarea/Textarea.razor.js
@@ -11,7 +11,7 @@ export function init(id) {
 
     Data.set(id, text);
     EventHandler.on(el, 'keydown', e => {
-        if (e.key === "Enter" || e.key === "NumpadEnter") {
+        if (e.key === "Enter") {
             const useShiftEnter = el.getAttribute('data-bb-shift-enter') === 'true';
             const shiftKey = e.shiftKey;
             if (useShiftEnter && shiftKey === false) {
diff --git a/src/BootstrapBlazor/wwwroot/modules/base-select.js b/src/BootstrapBlazor/wwwroot/modules/base-select.js
index f532b93c327..84c66842798 100644
--- a/src/BootstrapBlazor/wwwroot/modules/base-select.js
+++ b/src/BootstrapBlazor/wwwroot/modules/base-select.js
@@ -29,7 +29,7 @@ const initKeydownHandler = select => {
     const keydown = e => {
         const menu = popover.toggleMenu;
         const key = e.key;
-        if (key === "Enter" || key === 'NumpadEnter') {
+        if (key === "Enter") {
             if (popover.isPopover) {
                 popover.hide();
             }