diff --git a/assets/scss/snap-gallery.scss b/assets/scss/snap-gallery.scss
index e41c880..4c49b65 100644
--- a/assets/scss/snap-gallery.scss
+++ b/assets/scss/snap-gallery.scss
@@ -1,4 +1,4 @@
-.snap-wrapper {
+.snap-gallery-wrapper {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html
new file mode 100644
index 0000000..27a25f9
--- /dev/null
+++ b/layouts/partials/gallery.html
@@ -0,0 +1,9 @@
+{{ $imgs := .imgs }}
+{{ $galno := .galno }}
+<div class="snap-gallery-wrapper" style="--columns:{{ default 4 .columns }};--min-width:{{ default 200 .minwidth }};">
+  {{ range $i, $img := $imgs }}
+  <div class="snap-image">
+    <img src="{{ $img }}" onclick="openModal({{ $galno }});currentSlide({{ $galno }}, {{ add $i 1 }});">
+  </div>
+  {{ end }}
+</div>
diff --git a/layouts/partials/lightbox.html b/layouts/partials/lightbox.html
index d4f84e0..f99d1d5 100644
--- a/layouts/partials/lightbox.html
+++ b/layouts/partials/lightbox.html
@@ -1,4 +1,3 @@
-{{/*  The Modal/Lightbox  */}}
 {{ $imgs := .imgs }}
 {{ $galno := .galno }}
 <div class="snap-lightbox" id="snap-lightbox-{{ $galno }}">
diff --git a/layouts/shortcodes/snap-gallery.html b/layouts/shortcodes/snap-gallery.html
index 12286e5..90dcef0 100644
--- a/layouts/shortcodes/snap-gallery.html
+++ b/layouts/shortcodes/snap-gallery.html
@@ -19,15 +19,10 @@
   {{ end }}
 {{ end }}
 
-{{/*  Visible images  */}}
-<div class="snap-wrapper" style="--columns:{{ default 4 .Params.columns }};--min-width:{{ default 200 .Params.minwidth }};">
-{{ range $i, $img := $imgs }}
-  <div class="snap-image">
-    <img src="{{ $img }}" onclick="openModal({{ $galno }});currentSlide({{ $galno }}, {{ add $i 1 }});">
-  </div>
-{{ end }}
-</div>
+{{/*  Visible images in gallery mode  */}}
+{{ partial "gallery" (dict "columns" .Params.columns "minwidth" .Params.minwidth "imgs" $imgs "galno" $galno) }}
 
+{{/*  The Modal/Lightbox  */}}
 {{ partial "lightbox" (dict "galno" $galno "imgs" $imgs) }}
 
 {{/*  Load CSS/JS and make sure it is only loaded once  */}}