diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index 63d0c5f9d..772473856 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -43,7 +43,7 @@ function onModalHide() {
   if (props.showAdOnClose) {
     show_ads_window()
   }
-  props.onHide()
+  props.onHide?.()
 }
 </script>
 
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index e8b5d3775..8a70ab6bb 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -965,10 +965,6 @@ async function onKeyDown(event) {
     return;
   }
 
-  if (!event.repeat) {
-    rCount.value = 0;
-  }
-
   if (event.key === "r") {
     rCount.value++;
 
diff --git a/packages/ui/src/components/modal/Modal.vue b/packages/ui/src/components/modal/Modal.vue
index 7f034d7ee..eef208ae1 100644
--- a/packages/ui/src/components/modal/Modal.vue
+++ b/packages/ui/src/components/modal/Modal.vue
@@ -67,7 +67,7 @@ function show() {
 }
 
 function hide() {
-  props.onHide()
+  props.onHide?.()
   actuallyShown.value = false
   setTimeout(() => {
     shown.value = false
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 448c15319..38e3429f8 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -109,7 +109,7 @@ function show(event?: MouseEvent) {
 }
 
 function hide() {
-  props.onHide()
+  props.onHide?.()
   visible.value = false
   document.body.style.overflow = ''
   document.body.style.paddingRight = ''