diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue
index 177d829c00..d7fcf4702a 100644
--- a/core/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -153,6 +153,7 @@
         v-if="chart && showMapLayerController"
         :chart="chart"
         :series-id-map="seriesIdMap"
+        :show-edit-position="showEditPosition"
       />
     </div>
 
diff --git a/core/frontend/src/views/chart/components/map/MapLayerController.vue b/core/frontend/src/views/chart/components/map/MapLayerController.vue
index bec2f6781d..5423511f43 100644
--- a/core/frontend/src/views/chart/components/map/MapLayerController.vue
+++ b/core/frontend/src/views/chart/components/map/MapLayerController.vue
@@ -1,11 +1,12 @@
 <template>
 
   <el-popover
-    placement="left"
+    placement="left-start"
     title=""
     width="150"
     :append-to-body="false"
     trigger="click"
+    :popper-class="showEditPosition === 'bar-main-preview' ? 'map-layer-poper' : ''"
   >
     <i
       slot="reference"
@@ -51,6 +52,10 @@ export default {
           id: ''
         }
       }
+    },
+    showEditPosition: {
+      type: String,
+      required: true
     }
   },
   data() {
@@ -98,9 +103,15 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.map-layer-poper {
+  top: 3px !important;
+  right: 80px !important;
+  left: auto !important;
+}
+</style>
 
 <style scoped lang="scss">
-
 .de-ul li {
   margin: 5px 2px;
   cursor: pointer;