diff --git a/src/components/ZclEndpointCard.vue b/src/components/ZclEndpointCard.vue
index cf256f9de0..d780ab015d 100644
--- a/src/components/ZclEndpointCard.vue
+++ b/src/components/ZclEndpointCard.vue
@@ -18,7 +18,7 @@ limitations under the License.
   <div class="q-mx-md q-mb-sm">
     <q-card
       :class="{ 'active v-step-5': isSelectedEndpoint }"
-      @click="setSelectedEndpointType(endpointReference)"
+      @click="handleEndpointCardClick(endpointReference)"
       flat
     >
       <div
@@ -408,6 +408,10 @@ export default {
             this.selectedReporting.push(resolvedReference)
         })
       })
+    },
+    handleEndpointCardClick(endpointReference) {
+      this.setSelectedEndpointType(endpointReference)
+      this.$router.push({ path: '/' })
     }
   },
   computed: {