diff --git a/src/components/infoclick/InfoClickWin.vue b/src/components/infoclick/InfoClickWin.vue
index 6f6eb017..7dd2d895 100644
--- a/src/components/infoclick/InfoClickWin.vue
+++ b/src/components/infoclick/InfoClickWin.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import ModuleCard from './../modulecore/ModuleCard';
+import ModuleCard from '../modulecore/ModuleCard';
 import { WguEventBus } from '../../WguEventBus.js';
 import PropertyTable from './PropertyTable';
 import CoordsTable from './CoordsTable';
@@ -125,16 +125,18 @@ export default {
      */
     onMapClick (evt) {
       const me = this;
-      me.features = []
+      me.features = [];
       me.map.forEachFeatureAtPixel(evt.pixel,
         (feature, layer) => {
-          me.features.push([feature, layer])
+          if (layer) {
+            me.features.push([feature, layer]);
+          }
         });
 
       // collect feature attributes --> PropertyTable
       if (this.features.length !== 0) {
-        this.featureIdx = 0
-        this.numfeats = me.features.length
+        this.featureIdx = 0;
+        this.numfeats = me.features.length;
         this.viewProps(this.featureIdx)
       } else {
         this.attributeData = null;
@@ -148,19 +150,19 @@ export default {
     },
 
     prevFeat () {
-      this.featureIdx -= 1
+      this.featureIdx -= 1;
       if (this.featureIdx < 0) {
-        this.featureIdx = this.features.length - 1
+        this.featureIdx = this.features.length - 1;
       }
-      this.viewProps(this.featureIdx)
+      this.viewProps(this.featureIdx);
     },
 
     nextFeat () {
-      this.featureIdx += 1
+      this.featureIdx += 1;
       if (this.featureIdx > this.features.length - 1) {
-        this.featureIdx = 0
+        this.featureIdx = 0;
       }
-      this.viewProps(this.featureIdx)
+      this.viewProps(this.featureIdx);
     },
 
     viewProps (idx) {
@@ -169,8 +171,8 @@ export default {
       // do not show geometry property
       delete props.geometry;
       this.attributeData = props;
-      this.layerName = this.features[idx][1].get('name')
-      const lid = this.features[idx][1].get('lid')
+      this.layerName = this.features[idx][1].get('name');
+      const lid = this.features[idx][1].get('lid');
 
       const correspondingInteraction = MapInteractionUtil.getSelectInteraction(this.map, lid);
 
@@ -195,6 +197,7 @@ export default {
         me.registerMapClick();
       } else {
         // cleanup old data
+        me.registerMapClick(true);
         me.attributeData = null;
         me.coordsData = null;
       }
diff --git a/tests/unit/specs/components/infoclick/InfoClickWin.spec.js b/tests/unit/specs/components/infoclick/InfoClickWin.spec.js
index d6a0c70a..700836e1 100644
--- a/tests/unit/specs/components/infoclick/InfoClickWin.spec.js
+++ b/tests/unit/specs/components/infoclick/InfoClickWin.spec.js
@@ -104,15 +104,25 @@ describe('infoclick/InfoClickWin.vue', () => {
     });
 
     it('show registers map click when module is opened', () => {
-      let cnt = 0;
-      const mockFn = () => {
-        cnt++;
-      };
-      vm.registerMapClick = mockFn;
+      const map = new OlMap();
+      vm.map = map;
+      const onSPy = sinon.replace(map, 'on', sinon.fake(map.on));
 
       vm.show(false);
       vm.show(true);
-      expect(cnt).to.equal(1);
+
+      expect(onSPy).to.have.been.calledOnceWithExactly('singleclick', vm.onMapClick);
+    });
+
+    it('show unregisters map click when module is closed', () => {
+      const map = new OlMap();
+      vm.map = map;
+      const unSPy = sinon.replace(map, 'un', sinon.fake(map.un));
+
+      vm.show(true);
+      vm.show(false);
+
+      expect(unSPy).to.have.been.calledOnceWithExactly('singleclick', vm.onMapClick);
     });
   });
 });