diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index a4116ec0..a0a15310 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -302,6 +302,7 @@ onIonViewDidEnter(async() => {
 
 onIonViewDidLeave(async() => {
   await store.dispatch('count/updateCycleCountItems', []);
+  store.dispatch("product/currentProduct", {});
 })
 
 onBeforeRouteLeave(async (to) => {
@@ -403,6 +404,7 @@ async function scanProduct() {
 
   if(!selectedItem) {
     showToast(translate("Scanned item is not present in the count."))
+    queryString.value = ""
     return;
   }
 
@@ -423,6 +425,7 @@ async function scanProduct() {
       inputCount.value++
     }
   }
+  queryString.value = ""
 }
 
 function updateFilteredItems() {
diff --git a/src/views/ProductItemList.vue b/src/views/ProductItemList.vue
index 513d186a..467b533f 100644
--- a/src/views/ProductItemList.vue
+++ b/src/views/ProductItemList.vue
@@ -49,7 +49,7 @@ const productStoreSettings = computed(() => store.getters["user/getProductStoreS
 const currentProduct = computed(() => store.getters["product/getCurrentProduct"])
 
 onMounted(() => {
-  if (currentProduct.value) {
+  if (Object.keys(currentProduct.value).length) {
     navigateToDetail(currentProduct.value);
   }
 })