diff --git a/src/components/FlatmapVuer.vue b/src/components/FlatmapVuer.vue
index 7bcd40ae..a818eb87 100644
--- a/src/components/FlatmapVuer.vue
+++ b/src/components/FlatmapVuer.vue
@@ -1277,7 +1277,7 @@ export default {
     },
     /**
      * Function to highlight paths and features
-     * @param data 
+     * @param data
      */
     zoomToFeatures: function (data) {
       if (this.mapImp) {
@@ -1707,6 +1707,7 @@ export default {
                 }
               }
               const clickedItem = singleSelection ? data : data[0]
+              this.setConnectivityDataSource(this.viewingMode, clickedItem);
               if (this.viewingMode === 'Neuron Connection') {
                 this.retrieveConnectedPaths([clickedItem.models]).then((paths) => {
                   this.zoomToFeatures(paths)
@@ -1756,6 +1757,23 @@ export default {
         }
       }
     },
+    /**
+     * The data for connectivity data source is just a placeholder data
+     * to check which part of the map is clicked, e.g., path or feture or empty area,
+     * based on the viewing mode.
+     * The "connectivity-info-close" event will be emitted based on this data
+     * when there has a click event on map.
+     * @param viewingMode
+     * @param data
+     */
+    setConnectivityDataSource: function (viewingMode, data) {
+      // for Exploration mode, only path click will be used as data source
+      this.connectivityDataSource = data.source;
+      // for other modes, it can be feature or path
+      if (viewingMode === 'Neuron Connection' || viewingMode === 'Annotation') {
+        this.connectivityDataSource = data.featureId;
+      }
+    },
     /**
      * @public
      * Function triggered by viewing mode change.
@@ -2697,6 +2715,7 @@ export default {
       this.loading = false
       this.computePathControlsMaximumHeight()
       this.mapResize()
+      this.handleMapClick();
       this.setInitMapState();
       /**
        * This is ``onFlatmapReady`` event.
@@ -2704,6 +2723,22 @@ export default {
        */
       this.$emit('ready', this)
     },
+    /**
+     * @public
+     * Function to handle mouse click on map area
+     * after the map is loaded.
+     */
+    handleMapClick: function () {
+      const _map = this.mapImp.map;
+      if (_map) {
+        _map.on('click', (e) => {
+          if (!this.connectivityDataSource) {
+            this.$emit('connectivity-info-close');
+          }
+          this.connectivityDataSource = ''; // reset
+        });
+      }
+    },
     /**
      * @public
      * Function to show or hide the minimap