diff --git a/modules/services/kartaview.js b/modules/services/kartaview.js
index fa9fcf108..d20912474 100644
--- a/modules/services/kartaview.js
+++ b/modules/services/kartaview.js
@@ -367,8 +367,8 @@ export default {
 
 
     showViewer: function(context) {
-        var viewer = context.container().select('.photoviewer');
-        var isHidden = viewer.selectAll('.photo-wrapper.kartaview-wrapper.hide').size();
+        const wrap = context.container().select('.photoviewer');
+        const isHidden = wrap.selectAll('.photo-wrapper.kartaview-wrapper.hide').size();
 
         if (isHidden) {
             for (const service of Object.values(services)) {
@@ -377,12 +377,11 @@ export default {
                     service.hideViewer(context);
                 }
             }
-            viewer
+            wrap.classed('hide', false)
                 .selectAll('.photo-wrapper.kartaview-wrapper')
                 .classed('hide', false);
         }
 
-        viewer.classed('hide', false);
         return this;
     },
 
diff --git a/modules/services/mapilio.js b/modules/services/mapilio.js
index 652d19cfb..c47bea4d6 100644
--- a/modules/services/mapilio.js
+++ b/modules/services/mapilio.js
@@ -574,8 +574,8 @@ export default {
     },
 
     showViewer:function (context) {
-        let wrap = context.container().select('.photoviewer');
-        let isHidden = wrap.selectAll('.photo-wrapper.mapilio-wrapper.hide').size();
+        const wrap = context.container().select('.photoviewer');
+        const isHidden = wrap.selectAll('.photo-wrapper.mapilio-wrapper.hide').size();
 
         if (isHidden) {
             for (const service of Object.values(services)) {
@@ -584,12 +584,11 @@ export default {
                     service.hideViewer(context);
                 }
             }
-            wrap
+            wrap.classed('hide', false)
                 .selectAll('.photo-wrapper.mapilio-wrapper')
                 .classed('hide', false);
         }
 
-        wrap.classed('hide', false);
         return this;
     },
 
@@ -611,7 +610,6 @@ export default {
             .classed('currentView', false);
 
         this.setActiveImage();
-
         return this.setStyles(context, null);
     },
 
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index d2d0a05cd..faa35267d 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -261,6 +261,8 @@ export default {
             sequences: { rtree: new RBush(), lineString: {} },
             requests: { loaded: {}, inflight: {} }
         };
+
+        _mlyActiveImage = null;
     },
 
     // Get visible images
@@ -475,7 +477,7 @@ export default {
                 }
             }
 
-            wrap
+            wrap.classed('hide', false)
                 .selectAll('.photo-wrapper.mly-wrapper')
                 .classed('hide', false);
 
@@ -483,8 +485,6 @@ export default {
         }
 
         _isViewerOpen = true;
-        wrap.classed('hide', false);
-
         return this;
     },
 
diff --git a/modules/services/panoramax.js b/modules/services/panoramax.js
index d29212891..2b61f6ee0 100644
--- a/modules/services/panoramax.js
+++ b/modules/services/panoramax.js
@@ -684,8 +684,8 @@ export default {
      * @param {*} context
      */
     showViewer: function (context) {
-        let wrap = context.container().select('.photoviewer');
-        let isHidden = wrap.selectAll('.photo-wrapper.panoramax-wrapper.hide').size();
+        const wrap = context.container().select('.photoviewer');
+        const isHidden = wrap.selectAll('.photo-wrapper.panoramax-wrapper.hide').size();
         if (isHidden) {
             for (const service of Object.values(services)) {
                 if (service === this) continue;
@@ -693,14 +693,12 @@ export default {
                     service.hideViewer(context);
                 }
             }
-            wrap
+            wrap.classed('hide', false)
                 .selectAll('.photo-wrapper.panoramax-wrapper')
                 .classed('hide', false);
         }
 
         _isViewerOpen = true;
-        wrap.classed('hide', false);
-
         return this;
     },
 
diff --git a/modules/services/streetside.js b/modules/services/streetside.js
index cacf1a1af..6274b05b9 100644
--- a/modules/services/streetside.js
+++ b/modules/services/streetside.js
@@ -646,8 +646,8 @@ export default {
    * showViewer()
    */
   showViewer: function(context) {
-    let wrap = context.container().select('.photoviewer');
-    let isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
+    const wrap = context.container().select('.photoviewer');
+    const isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
 
     if (isHidden) {
       for (const service of Object.values(services)) {
@@ -657,11 +657,11 @@ export default {
         }
       }
       wrap
+        .classed('hide', false)
         .selectAll('.photo-wrapper.ms-wrapper')
         .classed('hide', false);
     }
 
-    wrap.classed('hide', false);
     return this;
   },
 
diff --git a/modules/services/vegbilder.js b/modules/services/vegbilder.js
index accf66145..332f9ca8e 100644
--- a/modules/services/vegbilder.js
+++ b/modules/services/vegbilder.js
@@ -505,10 +505,10 @@ export default {
         }
       }
       viewer
+        .classed('hide', false)
         .selectAll('.photo-wrapper.vegbilder-wrapper')
         .classed('hide', false);
     }
-    viewer.classed('hide', false);
     return this;
   },