diff --git a/src/components/Project/Basemaps/BasemapListItem.vue b/src/components/Project/Basemaps/BasemapListItem.vue
index 4869af1152ee2bbbb3a963e7ddd0ad61a0ce9d2f..cca18f533ea88b874ec79aa9851afe747fc979bd 100644
--- a/src/components/Project/Basemaps/BasemapListItem.vue
+++ b/src/components/Project/Basemaps/BasemapListItem.vue
@@ -179,7 +179,7 @@ export default {
     onlayerMove() {
       //* Get the names of the current layers in order.
       const currentLayersNamesInOrder = Array.from(
-        document.getElementsByClassName('layer-item')
+        document.getElementsByClassName(`basemap-${this.basemap.id}`)
       ).map((el) => el.id);
 
       //* increment value 'order' in this.basemap.layers looping over layers from template ^
diff --git a/src/components/Project/Basemaps/ProjectMappingContextLayer.vue b/src/components/Project/Basemaps/ProjectMappingContextLayer.vue
index 1ec4ccd10e5907ea40783bd6f55cf30b11fad6b5..1b6126f91c2e41a5e007f5c85ad4d87c11209fbe 100644
--- a/src/components/Project/Basemaps/ProjectMappingContextLayer.vue
+++ b/src/components/Project/Basemaps/ProjectMappingContextLayer.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     :id="layer.dataKey"
-    class="ui segment layer-item"
+    :class="`ui segment layer-item basemap-${basemapid}`"
   >
     <div class="ui divided form">
       <div